Conflicts:
src/gui/moviebrowser.cpp
src/gui/movieinfo.cpp
src/system/Makefile.am
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70e5e66327
Author: martii <m4rtii@gmx.de>
Date: 2013-06-12 (Wed, 12 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2a6dbb75a7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2003ed670d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-22 (Mon, 22 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d966e8363
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-18 (Thu, 18 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/moviebrowser.cpp
src/gui/nfs.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 706ea95092
Author: martii <m4rtii@gmx.de>
Date: 2013-06-29 (Sat, 29 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 420af7a4dc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-05 (Fri, 05 Sep 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 416646bbff
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
commit taken from max10s-neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: b7b0da12b4
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-07-03 (Thu, 03 Jul 2014)
Origin message was:
------------------
- moviebrowser: prevent segfault at movies w/o channellogo
commit taken from max10s-neutrino-mp
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a7c93d1926
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-02 (Wed, 02 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b63d1a243
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-06-28 (Sat, 28 Jun 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 649d1b1f9d
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)
Origin message was:
------------------
- change RenderString() default to UTF8
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5fb5ea91bf
Author: martii <m4rtii@gmx.de>
Date: 2014-05-06 (Tue, 06 May 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
remove movie thumbnail on RC_favorites key;
align thumbnail width on apollo for hw blit
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd49c36a7b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-21 (Mon, 21 Apr 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- Add non locale variants for CExtendedInput, CStringInput,
CStringInputSMS, CPINInput
THX Martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31842369cc
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
Origin message was:
------------------
Preparing the input classes for Lua
- Add non locale variants for CExtendedInput, CStringInput,
CStringInputSMS, CPINInput
THX Martii
------------------
This commit was generated by Migit
- Add non locale variants for CMenuOptionNumberChooser and
CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
THX Martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: afbd87083b
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
Origin message was:
------------------
Preparing the menu classes for Lua Part #3
- Add non locale variants for CMenuOptionNumberChooser and
CMenuOptionChooser
- Adaptation of CMenuOptionStringChooser, CChangeObserver
THX Martii
------------------
This commit was generated by Migit
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
Origin commit data
------------------
Branch: ni/coolstream
Commit: b41819190d
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)
Origin message was:
------------------
Preparing the menu classes for Lua Part #2
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
THX Martii
------------------
This commit was generated by Migit
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-13 (Mon, 13 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 52741fb1e4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-04 (Sat, 04 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: 3bdb1af87e
Author: martii <m4rtii@gmx.de>
Date: 2014-01-03 (Fri, 03 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: eda90ac834
Author: martii <m4rtii@gmx.de>
Date: 2013-11-23 (Sat, 23 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35eb31ad89
Author: martii <m4rtii@gmx.de>
Date: 2013-07-02 (Tue, 02 Jul 2013)
------------------
This commit was generated by Migit
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3a8e9cf95d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-12-21 (Sat, 21 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
... and set "record start" as the default selection
Origin commit data
------------------
Branch: ni/coolstream
Commit: 932c201074
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-12-19 (Thu, 19 Dec 2013)
Origin message was:
------------------
- moviebrowser: remove cancel button from startPosSelectionMenu ...
... and set "record start" as the default selection
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: fd5f9f118d
Author: martii <m4rtii@gmx.de>
Date: 2013-10-06 (Sun, 06 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a0fdba710
Author: martii <m4rtii@gmx.de>
Date: 2013-08-15 (Thu, 15 Aug 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 789280736d
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-05 (Tue, 05 Nov 2013)
Origin message was:
------------------
- moviebrowser: use ccomponents to paint header
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: fed0bfda8c
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-04 (Mon, 04 Nov 2013)
Origin message was:
------------------
- moviebrowser: disable hdd-bar in youtube mode
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Provides a unified header file, so it is not required to select a
certain header file.
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7798affc6
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-10-24 (Thu, 24 Oct 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f7792352b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-08-14 (Wed, 14 Aug 2013)
Origin message was:
------------------
- moviebrowser.cpp: reduce console output at startup
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4fa0c9a233
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-30 (Tue, 30 Jul 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c7e5bc6e20
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-26 (Fri, 26 Jul 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
- If necessary, Correct data types of the color values
Origin commit data
------------------
Branch: ni/coolstream
Commit: c60c5c5ce3
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-07-11 (Thu, 11 Jul 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9cf2c7e0c6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-20 (Thu, 20 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8836a15a42
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e01e96c1ac
Author: martii <m4rtii@gmx.de>
Date: 2013-06-09 (Sun, 09 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 09c651a75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-06-13 (Thu, 13 Jun 2013)
Origin message was:
------------------
- moviebrowser: enable more characters in youtube search
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: e59189f890
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-06-03 (Mon, 03 Jun 2013)
Origin message was:
------------------
* youtube feeds: Fix header texts in movie browser
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4c857837d5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-05-30 (Thu, 30 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
*) not really a fix - just a better terrible solution
Origin commit data
------------------
Branch: ni/coolstream
Commit: ee1ca8b71f
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Origin message was:
------------------
- moviebrowser: fix* buttonbar
*) not really a fix - just a better terrible solution
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3e0636a617
Author: Thilo Graf <dbt@novatux.de>
Date: 2013-04-23 (Tue, 23 Apr 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
*) not really a fix - just a better terrible solution
Origin commit data
------------------
Branch: ni/coolstream
Commit: fae9bb0985
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-04-24 (Wed, 24 Apr 2013)
Origin message was:
------------------
- moviebrowser: fix* buttonbar
*) not really a fix - just a better terrible solution
------------------
This commit was generated by Migit
