Commit Graph

201 Commits

Author SHA1 Message Date
vanhofen
108a1c1b93 change getRenderWidth() default to UTF8
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8b91cda918
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-06-11 (Wed, 11 Jun 2014)

Origin message was:
------------------
- change getRenderWidth() default to UTF8

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-06-11 23:07:00 +02:00
Stefan Seyfried
ca370a6f2b scan_setup: fix build without ENABLE_FASTSCAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: b53c1d1bd6
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-05-05 12:56:16 +02:00
Stefan Seyfried
ccf8001cde scan_setup: fix build without ENABLE_FASTSCAN
Origin commit data
------------------
Branch: ni/coolstream
Commit: 94eee5fe49
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-27 19:33:03 +02:00
Stefan Seyfried
8df9ff12cc Merge remote-tracking branch 'check/next-cc'
build-tested only, needs fixing

Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/Makefile.am
	src/driver/rcinput.cpp
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/pluginlist.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/user_menue.cpp
	src/gui/videosettings.cpp
	src/gui/widget/menue.cpp
	src/neutrino.cpp
	src/neutrinoMessages.h
	src/system/locals.h
	src/system/locals_intern.h
	src/zapit/include/zapit/scan.h
	src/zapit/src/femanager.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/transponder.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)



------------------
This commit was generated by Migit
2014-04-27 19:14:06 +02:00
[CST] Focus
2dd049be47 gui/scan_setup.cpp: set diseqc options only for satellite frontend
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7d3b0b021b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-22 (Tue, 22 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-22 13:37:05 +04:00
[CST] Focus
431d402526 gui/scan_setup.cpp: add explicit option to enable/disable fast-scan update
Origin commit data
------------------
Branch: ni/coolstream
Commit: b925988afe
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-07 (Mon, 07 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-14 14:18:32 +04:00
[CST] Focus
cc0dd848d3 gui/scan_setup.cpp: save FST version after scan
Origin commit data
------------------
Branch: ni/coolstream
Commit: 14d4ffa28f
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-04-02 (Wed, 02 Apr 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-04-02 17:32:58 +04:00
[CST] Focus
7092645b4b gui/scan_setup.cpp: add dynamic diseqc options switch based on frontend mode
Origin commit data
------------------
Branch: ni/coolstream
Commit: bfc30ae53e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-21 (Fri, 21 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-21 17:18:26 +04:00
[CST] Focus
04ddc607ad gui/scan_setup.cpp: add fast-scan operators, add fast-scan diseqc auto-config and menu to change diseqc
Origin commit data
------------------
Branch: ni/coolstream
Commit: acffe8024d
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-20 (Thu, 20 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-21 17:18:06 +04:00
[CST] Focus
f68cccaebf gui/scan_setup.cpp: move rotor options to its own menus
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7682d58070
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 16:09:10 +04:00
[CST] Focus
630f1017ab gui/scan_setup.cpp, gui/motorcontrol.cpp: use per frontend rotor swap option
Origin commit data
------------------
Branch: ni/coolstream
Commit: 929eb86760
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-04 (Tue, 04 Mar 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-03-06 16:09:09 +04:00
[CST] Focus
28849f2589 gui/scan_setup.cpp: fix DVB-T frontend labels
Origin commit data
------------------
Branch: ni/coolstream
Commit: a26af0104b
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-19 (Wed, 19 Feb 2014)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
2014-02-28 13:44:23 +04:00
Stefan Seyfried
bdbf01d0cb scansetup: add DVB-T
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
2014-02-28 13:44:22 +04:00
Stefan Seyfried
5b2aa4c0be add basic support for DVB-T
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
2014-02-28 13:44:22 +04:00
Stefan Seyfried
b7c804fc22 Merge remote-tracking branch 'check/next-cc'
compiles, nothing else.

Conflicts:
	configure.ac
	src/Makefile.am
	src/gui/Makefile.am
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan_setup.cpp
	src/gui/start_wizard.cpp
	src/gui/test_menu.cpp
	src/gui/user_menue.cpp
	src/gui/widget/hintboxext.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/messagebox.cpp
	src/gui/widget/stringinput.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)



------------------
This commit was generated by Migit
2014-01-23 14:08:37 +01:00
vanhofen
ae8cfd7dc2 adapt ShowHint handling from martii's neutrino-mp
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
2014-01-22 12:11:52 +01:00
Michael Liebmann
2fd195d66a Preparing the input classes for Lua
- 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
2014-01-19 20:57:38 +01:00
Michael Liebmann
a46c558669 CScanSettings: convert char[...] configuration values to std::string
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
2014-01-19 20:57:38 +01:00
Michael Liebmann
7b4e3bc03b Preparing the menu classes for Lua Part #2
- 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
2014-01-19 20:57:37 +01:00
Stefan Seyfried
19cb443dec Merge remote-tracking branch 'check/next-cc'
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
2014-01-19 13:37:24 +01:00
Jacek Jendrzej
81ec9a0e26 remove CURRENTSERVICES_XML after reload channels
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
2014-01-18 21:02:23 +01:00
Stefan Seyfried
402d13aa4d Merge remote-tracking branch 'check/next-cc'
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
2014-01-12 14:41:44 +01:00
[CST] Focus
bbdde60688 gui/scan_setup.cpp: fix separator between sat and cable scan option
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
2014-01-08 16:11:18 +04:00
Stefan Seyfried
464d5ab9b9 Merge remote-tracking branch 'check/next-cc'
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
2013-12-25 22:51:23 +01:00
[CST] Focus
0087a5bbe6 gui/scan_setup.cpp: fix tune timeout: value is in 1/10 sec (100ms)
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
2013-12-23 19:53:32 +04:00
Stefan Seyfried
6fae9a0db4 Merge remote-tracking branch 'check/next-cc'
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
2013-12-22 21:25:05 +01:00
martii
70757cd44e gui/scan_setup: use locale when displaying seconds
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
2013-12-22 16:36:13 +01:00
martii
9bcae0babc gui/scan_setup: use language specific decimal separator
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
2013-12-22 16:36:13 +01:00
martii
b2727d774b gui/scan_setup: show unit for motor speed
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
2013-12-22 16:36:13 +01:00
martii
bed0567841 gui/scan_setup: add unit to fe timeout chooser
(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
2013-12-21 22:04:32 +01:00
Stefan Seyfried
2c48d93e05 Merge remote-tracking branch 'check/next-cc'
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
2013-12-07 18:28:56 +01:00
Michael Liebmann
0ad1f062ce CScanSetup: Remove duplicate separator line from cable scanmenu
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
2013-12-01 16:39:35 +01:00
Stefan Seyfried
d63fbea8f3 fix manual terrestrial scan (untested)
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
2013-12-01 01:11:51 +01:00
Stefan Seyfried
ea50f5f7bc Merge branch 'check/next-cc'
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
2013-11-30 20:17:31 +01:00
[CST] Focus
e0431a0723 gui/scan_setup.cpp: fix memleaks
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
2013-11-29 17:27:10 +04:00
Stefan Seyfried
52ff7cfcb9 Merge branch 'check/next-cc'
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
2013-11-13 14:04:15 +01:00
[CST] Focus
6f4adf6809 gui/scan_setup.cpp: remove tuner name from tuner setup menu header for easymenu mode
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
2013-11-12 17:21:36 +04:00
Stefan Seyfried
b0077cafc5 Merge branch 'check/next-cc'
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
2013-11-10 16:55:53 +01:00
[CST] Focus
d1fa33d22a gui/scan_setup.cpp: force fe link on master change, too
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
2013-11-08 15:54:20 +04:00
[CST] Focus
9a9e36193e gui/scan_setup.cpp: disable frontend setup, if record running
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
2013-11-08 15:50:23 +04:00
[CST] Focus
20eb7636c8 gui/scan_setup.cpp: do not add satellites to select from disabled frontend;
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
2013-11-05 15:34:24 +04:00
[CST] Focus
3943f65ac2 gui/scan_setup.cpp: set wizard mode for frontend setup menu
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
2013-11-05 11:44:44 +04:00
[CST] Focus
f96beaeb2f gui/scan_setup.cpp: fix ddc3919eb9,
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
2013-11-01 09:08:58 +04:00
[CST] Focus
ddc3919eb9 gui/scan_setup.cpp: add tuner type to tuner select menu
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
2013-10-30 18:44:48 +04:00
[CST] Focus
e6d1863e1f gui/scan_setup.cpp: fix broken zapit config for frontend setup
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
2013-10-25 16:17:55 +04:00
[CST] Focus
5872a0a8a5 gui/scan_setup.cpp: fix crashes due to move tuner setup;
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
2013-10-25 15:51:34 +04:00
[CST] Focus
831d6efdd1 move tuner setup to Service menu
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
2013-10-25 14:27:38 +04:00
Stefan Seyfried
971d575b78 Merge branch 'check/next-cc'
Compiles on most platforms, starts. Not really tested.

Conflicts:
	acinclude.m4
	lib/libdvbsub/Makefile.am
	lib/libtriple/Makefile.am
	lib/libtuxtxt/Makefile.am
	src/Makefile.am
	src/create_rcsim_h.sh
	src/daemonc/Makefile.am
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/eitd/Makefile.am
	src/gui/Makefile.am
	src/gui/bouquetlist.cpp
	src/gui/channellist.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/streaminfo2.h
	src/gui/update.cpp
	src/gui/widget/Makefile.am
	src/gui/widget/listbox.cpp
	src/neutrino.cpp
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/rcsim.c
	src/system/Makefile.am
	src/zapit/src/Makefile.am
	src/zapit/src/frontend.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)



------------------
This commit was generated by Migit
2013-10-21 22:58:55 +02:00
[CST] Focus
1506da2359 gui/scan_setup.cpp: cleanup, fix FEC options on mixed sat+cable box
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
2013-09-16 14:36:22 +04:00
Stefan Seyfried
2dcc32acd2 Merge remote-tracking branch 'check/next-cc'
needs buildfixing...

Conflicts:
	src/eitd/sectionsd.cpp
	src/gui/audioplayer.cpp
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/infoclock.cpp
	src/gui/infoviewer.cpp
	src/gui/motorcontrol.cpp
	src/gui/osd_setup.cpp
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/streaminfo2.cpp
	src/gui/update.cpp
	src/gui/widget/progresswindow.cpp
	src/gui/widget/textbox.cpp
	src/neutrino.cpp
	src/zapit/include/zapit/femanager.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 32de6beef0
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-09-01 (Sun, 01 Sep 2013)



------------------
This commit was generated by Migit
2013-09-01 19:46:10 +02:00