Conflicts:
acinclude.m4
Origin commit data
------------------
Branch: ni/coolstream
Commit: aeb3ead6a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 258d2b8666
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-30 (Wed, 30 Jan 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
multiple files.
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee169288a5
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
Origin message was:
------------------
neutrino: add multiple paths so they can be configured and not be hard-coded in
multiple files.
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfa6c6e738
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-11 (Fri, 11 Jan 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e426104399
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2012-11-13 (Tue, 13 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-experimental@1029 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2eb0338560
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2011-01-15 (Sat, 15 Jan 2011)
------------------
This commit was generated by Migit
