Conflicts:
src/gui/osdlang_setup.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 051fb7c008
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-15 (Sun, 15 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/gui/epgview.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a21399479e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 81eba0b35c
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-02-03 (Tue, 03 Feb 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
reduce content classification caching (leaving old code with ifdef)
Origin commit data
------------------
Branch: ni/coolstream
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)
------------------
This commit was generated by Migit
...and make sure they are actally used everywhere
This is the correct fix for 9715cfaba2
Origin commit data
------------------
Branch: ni/coolstream
Commit: 35c331de69
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-28 (Wed, 28 Jan 2015)
------------------
This commit was generated by Migit
Without this, on some systems the system headers are searched first for
the DVB includes before the paths provided via CFLAGS are searched.
This sounds like a preprocessor bug, but this "fix" is surely harmless.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2e5446ad9f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-27 (Tue, 27 Jan 2015)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1e03544d7e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b5e7b5ba3
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-09 (Fri, 09 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8023a6317b
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-01-03 (Sat, 03 Jan 2015)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
... to provide the EPG data in frequently intervals on an external device
Origin commit data
------------------
Branch: ni/coolstream
Commit: e21a79195e
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-12-04 (Thu, 04 Dec 2014)
Origin message was:
------------------
- add epg_save_frequently feature ...
... to provide the EPG data in frequently intervals on an external device
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f71396e455
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-16 (Thu, 16 Oct 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
This allows for starting Lua scripts in neutrino context from the
command line. Experimental, not fully regression-tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5d25185684
Author: martii <m4rtii@gmx.de>
Date: 2014-10-13 (Mon, 13 Oct 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 27a3a92b2d
Author: martii <m4rtii@gmx.de>
Date: 2014-09-21 (Sun, 21 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: 98511b686d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-09-23 (Tue, 23 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: 3567e97e73
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-09 (Tue, 09 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: 3513f9830a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-09-02 (Tue, 02 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: f15e5eeb39
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-23 (Wed, 23 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: 40167afef4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-16 (Wed, 16 Jul 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
for compatibility if config file entry is changed from boolean to int32 or int64
based on patch by martii <m4rtii@gmx.de> in Neutrino-MP Git
Origin commit data
------------------
Branch: ni/coolstream
Commit: ad498249d1
Author: Christian Schuett <Gaucho316@hotmail.com>
Date: 2014-06-23 (Mon, 23 Jun 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f47c157db2
Author: [CST] Bas <bas@coolstreamtech.com>
Date: 2014-04-09 (Wed, 09 Apr 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 88a622a0ad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-31 (Mon, 31 Mar 2014)
------------------
No further description and justification available within origin commit message!
------------------
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: 71b550b04b
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: d2c5fc8604
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
...only build-tested, needs fixes
Origin commit data
------------------
Branch: ni/coolstream
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8c7968edc4
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-07 (Fri, 07 Feb 2014)
Origin message was:
------------------
-add pseudo AdZap timertype
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 31221edc47
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-01 (Sat, 01 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
- 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
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 07caa88ad2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
...and EVT_ANNOUNCE_NEXTPROGRAM.
These are only internal API, so no incompatibility should occur.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d179f3f54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 49035cedec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 42bc6f3081
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-09 (Thu, 09 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: 6944d53cef
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-09 (Thu, 09 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: 0cd6cfa68c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-09 (Thu, 09 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
To ensure it is no longer used, rename it to __TIMER_NEXTPROGRAM.
It cannot be removed without breaking compatibility, since it is
part of the API (the integers values of enum CTimerEventTypes are
written to timerd.conf)
Origin commit data
------------------
Branch: ni/coolstream
Commit: d1eebea381
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
...and EVT_ANNOUNCE_NEXTPROGRAM.
These are only internal API, so no incompatibility should occur.
Origin commit data
------------------
Branch: ni/coolstream
Commit: e2bcee0a0f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
This event should be completely obsolete (it was used before
EIT-update was working correctly), so get rid of it in the code.
For now it is just commented out, until further testing is done.
Origin commit data
------------------
Branch: ni/coolstream
Commit: c68a67529c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1b8e5c0445
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-09 (Thu, 09 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: 2733fc71e8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-09 (Thu, 09 Jan 2014)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
