Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d2c3f3f10
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
------------------
This commit was generated by Migit
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added
Origin commit data
------------------
Branch: ni/coolstream
Commit: 367f6f6559
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: be2966035f
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-03-11 (Mon, 11 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: d0f9836173
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added
Origin commit data
------------------
Branch: ni/coolstream
Commit: 99e2ff32c9
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: bb098c376e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-10 (Sun, 10 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
when adding a channel to favorites from the channellist contextmenu
the favorites bouquet was chosen, which is not helpful if further
favorites should be added
Origin commit data
------------------
Branch: ni/coolstream
Commit: 21f79f1284
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: 1ed105fd5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 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: 9477ea5edd
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
new progressbar design
* colored horizontal lines
* colored vertical lines
* colored solid bar
Origin commit data
------------------
Branch: ni/coolstream
Commit: 385d4ff6a9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-09 (Sat, 09 Mar 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b95859da7c
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
Conflicts:
data/locale/english.locale
src/neutrino.cpp
src/system/setting_helpers.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8048673dec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-07 (Thu, 07 Mar 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: cbfa6f88c5
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-03-05 (Tue, 05 Mar 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: 988a8ebec2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
------------------
This commit was generated by Migit
this needs more work to avoid crashes when interrupted early
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
Origin commit data
------------------
Branch: ni/coolstream
Commit: b6df7de7f7
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
------------------
This commit was generated by Migit
this needs more work to avoid crashes when interrupted early
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6c4b9741ec
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
------------------
This commit was generated by Migit
Instead of hardcoding the maximum number of arguments to the
my_system helper, pass a variable argument list.
The function is deliberately source-incompatible with the old
implementation (as opposed to a variant with a sentinel NULL
argument, which would be compatible) to find all users and to
make sure that new future users of this function are not
overlooked during merges with other branches.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96650cdd45
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-03-03 (Sun, 03 Mar 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b18346c98
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-03-01 (Fri, 01 Mar 2013)
Origin message was:
------------------
- neutrino.cpp: fix handling of g_settings.mode_left_right_key_tv
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: f5c162522b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-28 (Thu, 28 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 876b697a14
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-26 (Tue, 26 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
use portable C99 format string macros for 64bit types to
fix many warnings when compiling for 64bit architectures,
add some (int) casts for size_t
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4dbeb3a31e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-03 (Sat, 03 Nov 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6174c657a1
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-13 (Wed, 13 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 63c66c1f4e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 58c9c9f884
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-12 (Tue, 12 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 46657a1c6b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0fd4d4f439
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-02-11 (Mon, 11 Feb 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: c4f8bf17a9
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-10 (Sun, 10 Feb 2013)
Origin message was:
------------------
- neutrino.cpp: remove double determination of g_info.delivery_system
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: d8bd46e9d1
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-02-04 (Mon, 04 Feb 2013)
Origin message was:
------------------
- channellist: make miniTV switchable
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: bcd02435dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-31 (Thu, 31 Jan 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Conflicts:
src/eitd/SIevents.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7e701bfefc
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5776c67825
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-29 (Tue, 29 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: 1320462626
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-01-29 (Tue, 29 Jan 2013)
Origin message was:
------------------
- neutrino.cpp: fix wrong configfile in loadKeys()
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
move HD bouquet to 'all' to use sorting on it
Origin commit data
------------------
Branch: ni/coolstream
Commit: d591e90395
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-28 (Mon, 28 Jan 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0ea1a39e0a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-16 (Wed, 16 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: d0ea4ad62e
Author: Jacek Jendrzej <overx300@gmail.com>
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: be0eb77373
Author: Jacek Jendrzej <overx300@gmail.com>
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: 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
even though there is not much left to do if no frontend is present,
at least the user can be informed about that fact before crashing :-)
Origin commit data
------------------
Branch: ni/coolstream
Commit: aa098a7701
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-01-13 (Sun, 13 Jan 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a746945c2d
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: 6e41c65fad
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 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: 01209180b0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-01-09 (Wed, 09 Jan 2013)
------------------
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
This reverts commit 2fff862e8b.
(it does not fix the real problem)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8dcd92d557
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: 0806c47c73
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2012-12-20 (Thu, 20 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: 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
