Conflicts:
src/gui/scan_setup.cpp
src/gui/scan_setup.h
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1a4f65302e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-05-12 (Sun, 12 May 2013)
------------------
This commit was generated by Migit
This needs more fine tuning wrt scan setup etc, but should work for now.
Conflicts:
data/Makefile.am
data/locale/english.locale
src/gui/scan.cpp
src/gui/scan_setup.cpp
src/neutrino.cpp
src/zapit/include/zapit/getservices.h
src/zapit/src/frontend.cpp
src/zapit/src/getservices.cpp
src/zapit/src/transponder.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5f4c1b986c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-10-07 (Sun, 07 Oct 2012)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 6995e1a765
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)
Origin message was:
------------------
- adapt ShowHint 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
Origin commit data
------------------
Branch: ni/coolstream
Commit: 0a5a7b3146
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-18 (Sat, 18 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
Conflicts:
src/neutrino.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7b40b61c9a
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
Origin message was:
------------------
remove CURRENTSERVICES_XML after reload channels
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a92141d147
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 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: 468a8df8f4
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-29 (Sun, 29 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Lightly tested only...
Origin commit data
------------------
Branch: ni/coolstream
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0afda1c11
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-12-23 (Mon, 23 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
untested, probably needs some buildfixing
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d87ce9c54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-22 (Sun, 22 Dec 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: b69bdc38d9
Author: martii <m4rtii@gmx.de>
Date: 2013-12-22 (Sun, 22 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: 18c97c17d3
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 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: a0f2960501
Author: martii <m4rtii@gmx.de>
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 add unit-locals from martiis-neutrino-mp)
Origin commit data
------------------
Branch: ni/coolstream
Commit: 60e6647244
Author: martii <m4rtii@gmx.de>
Date: 2013-12-21 (Sat, 21 Dec 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5976f03ca2
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-07 (Sat, 07 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: 101fe3a4b8
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2013-11-11 (Mon, 11 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: 9ca8b57ed9
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-01 (Sun, 01 Dec 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Only compile-tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b5e736e81b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-30 (Sat, 30 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 4e48e81914
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-27 (Wed, 27 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Only compile-tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 3022dc251d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-12 (Tue, 12 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
Compiles on most platforms, starts. Not really tested.
Origin commit data
------------------
Branch: ni/coolstream
Commit: b93a372b54
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-10 (Sun, 10 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 339b047019
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-08 (Fri, 08 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: 7c4b9d3fdd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-08 (Fri, 08 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
add intro items for scan menu not dependent on wizard mode:
after wizard mode disabled, code add one more item (subhead), and saved
selected invalidated, as result ie no selected item at all
Origin commit data
------------------
Branch: ni/coolstream
Commit: 70725b323b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8ef3efc72d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-05 (Tue, 05 Nov 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
do not show tuner name in tuner select menu for easymenu mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: de8262f03f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-01 (Fri, 01 Nov 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 96b7d939ca
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-30 (Wed, 30 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: 7bf76aad3d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
auto-save settings;
re-order menu options;
should fix satSelect memleak
Origin commit data
------------------
Branch: ni/coolstream
Commit: c437b8cf6a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 Oct 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 067891fe52
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-10-25 (Fri, 25 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: 17bc0f968d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-09-16 (Mon, 16 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: 5e60b64469
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2013-09-01 (Sun, 01 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: 5b57fc6150
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-23 (Tue, 23 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: baf2df01dd
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-17 (Wed, 17 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: ae1abb6fa6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-17 (Wed, 17 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: 4d7fb7e362
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-07-13 (Sat, 13 Jul 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
again: it compiles, but is not really tested...
Conflicts:
acinclude.m4
src/driver/volume.cpp
src/gui/infoviewer.cpp
src/gui/osd_setup.cpp
src/gui/start_wizard.cpp
src/zapit/src/getservices.cpp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7cfe54dc2f
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-07-06 (Sat, 06 Jul 2013)
------------------
This commit was generated by Migit
which only ask for gui language and show fast scan (sat) and/or simple cable scan menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: d5e57f8877
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-28 (Fri, 28 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 584405883d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
seems to be fixed.
This reverts commit b35324f201.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5c60ba98e6
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-27 (Thu, 27 Jun 2013)
------------------
This commit was generated by Migit
This reverts commit b35324f201.
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5b44feae1b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-06-16 (Sun, 16 Jun 2013)
------------------
This commit was generated by Migit
Origin commit data
------------------
Branch: ni/coolstream
Commit: 9412f3a041
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-06-10 (Mon, 10 Jun 2013)
------------------
No further description and justification available within origin commit message!
------------------
This commit was generated by Migit
