- Fix merge conflicts
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9bb3cdf3ec
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-03-28 (Mon, 28 Mar 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: ed99066466
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-26 (Tue, 26 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 85c437fac3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 514d6344a6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 71d4ec8339
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- Adapt and extend hw_caps for cst hardware
Origin commit data
------------------
Branch: ni/coolstream
Commit: fe9a2c19e4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)
------------------
This commit was generated by Migit
This need buildfixes and some functional updates...
Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 294ed15de6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-29 (Thu, 29 Oct 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
defining it in video.h does not work as it is not
included everywhere where the define is needed
Origin commit data
------------------
Branch: ni/coolstream
Commit: dfdd1976e9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-25 (Wed, 25 Feb 2015)
------------------
This commit was generated by Migit
broken, needs buildfixing
Origin commit data
------------------
Branch: ni/coolstream
Commit: add688bbb8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-23 (Sun, 23 Feb 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31f6c79edf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: cfe6facea4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-22 (Wed, 22 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d379dcb30
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-29 (Sun, 29 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13fb2bc67a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-26 (Thu, 26 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 831fff71f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-03 (Sun, 03 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c2a11f6dd2
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-03 (Tue, 03 Sep 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 83c7de004e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-10 (Fri, 10 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a549b97924
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-05-28 (Tue, 28 May 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 138160ae4f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 30d650999d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-08 (Fri, 08 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5ed005ff8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 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: d3e2a2bdd0
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: f92d9e6e57
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: acfd623d02
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/widget/hintboxext.cpp
src/nhttpd/tuxboxapi/coolstream/controlapi.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8f5467fdb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-12-30 (Sun, 30 Dec 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b1138e16b0
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Origin message was:
------------------
* Fix include path for moved header files
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: da716f865e
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-12-13 (Thu, 13 Dec 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 998ae6d81d
Author: vanhofen <vanhofen@gmx.de>
Date: 2012-12-13 (Thu, 13 Dec 2012)
Origin message was:
------------------
- svn_CROSSENVIRONMENT_coolstream: move files to new right place
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ae305953c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70836baa48
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-09-25 (Tue, 25 Sep 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Use hardware_caps instead of cs_get_revision() and #ifdef HAVE_FOO_HW
to distinguish between different boxtypes.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04ee2e87f3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-09-23 (Sun, 23 Sep 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f8aa4262cb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-08-03 (Fri, 03 Aug 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e14fc80ed5
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-05-08 (Tue, 08 May 2012)
Origin message was:
------------------
-pedantic fixes
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 20aaec4e1c
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-04-26 (Thu, 26 Apr 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9f3e2dc9c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-29 (Thu, 29 Mar 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2ecc60cf71
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
off, auto (old ON, if supported by device) and force
git-svn-id: file:///home/bas/coolstream_public_svn/THIRDPARTY/applications/neutrino-beta@2135 e54a6e83-5905-42d5-8d5c-058d10e6a962
Origin commit data
------------------
Branch: ni/coolstream
Commit: 84afbc9a66
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-03-02 (Fri, 02 Mar 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f9010a8bd1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2012-01-13 (Fri, 13 Jan 2012)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
