Commit Graph

87 Commits

Author SHA1 Message Date
vanhofen
7cd92a9905 use HAVE_LIBSTB_HAL to fix coolstream build
Origin commit data
------------------
Branch: ni/coolstream
Commit: 13106b016b
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-18 (Sat, 18 Jan 2020)

Origin message was:
------------------
- use HAVE_LIBSTB_HAL to fix coolstream build

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

------------------
This commit was generated by Migit
2020-01-18 11:36:58 +01:00
BPanther
ffd1e44d40 vuplus: relevant pids routing - fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: e440215722
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)


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

------------------
This commit was generated by Migit
2020-01-18 11:36:58 +01:00
BPanther
ad87f12975 vuplus: relevant pids routing - fix
Origin commit data
------------------
Branch: ni/coolstream
Commit: 75a8b84d7e
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)


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

------------------
This commit was generated by Migit
2020-01-18 11:36:58 +01:00
BPanther
ba4b2c60dd vuplus: relevant pids routing
Conflicts:
	src/neutrino.cpp
	src/system/settings.h
	src/zapit/include/zapit/zapit.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 9b5d99819b
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)



------------------
This commit was generated by Migit
2020-01-18 11:36:58 +01:00
max_10
5e0c316c0c add check-live-ci (thx DboxOldie)
Conflicts:
	src/gui/cam_menu.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1d9defc6a6
Author: max_10 <max_10@gmx.de>
Date: 2016-07-08 (Fri, 08 Jul 2016)



------------------
This commit was generated by Migit
2020-01-18 00:24:09 +01:00
vanhofen
7b1ea34955 cam_menu: avoid duplicate code
Origin commit data
------------------
Branch: ni/coolstream
Commit: f7f668d21f
Author: vanhofen <vanhofen@gmx.de>
Date: 2020-01-18 (Sat, 18 Jan 2020)

Origin message was:
------------------
- cam_menu: avoid duplicate code

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

------------------
This commit was generated by Migit
2020-01-18 00:07:39 +01:00
BPanther
0e01ee36a3 vuplus: dvb wait delay for ci response
Conflicts:
	src/gui/cam_menu.cpp
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 10d1aaf526
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)



------------------
This commit was generated by Migit
2020-01-18 00:07:39 +01:00
BPanther
2d280c0041 ci "extra high" added
Conflicts:
	src/gui/cam_menu.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: e005f3e654
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2020-01-18 (Sat, 18 Jan 2020)



------------------
This commit was generated by Migit
2020-01-18 00:07:39 +01:00
Markus Volk
0303a556bb cam_menu.cpp: increase destination array to avoid possible truncation
Signed-off-by: MarkusVolk <f_l_k@t-online.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: 6cdfd5c37a
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-01-10 (Fri, 10 Jan 2020)



------------------
This commit was generated by Migit
2020-01-10 22:30:25 +01:00
Markus Volk
59febbe94d Revert "cam_menu: reduce dub code, avoid possible format-truncation error"
This reverts commit bf9b5270b9387887cac10f464f6b521805d60b08.

Signed-off-by: MarkusVolk <f_l_k@t-online.de>


Origin commit data
------------------
Branch: ni/coolstream
Commit: cb3e66585e
Author: Markus Volk <f_l_k@t-online.de>
Date: 2020-01-10 (Fri, 10 Jan 2020)



------------------
This commit was generated by Migit
2020-01-10 22:30:25 +01:00
Thilo Graf
6679a7236c cam_menu: reduce dub code, avoid possible format-truncation error
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7bb23d2347
Author: Thilo Graf <dbt@novatux.de>
Date: 2020-01-06 (Mon, 06 Jan 2020)


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

------------------
This commit was generated by Migit
2020-01-06 22:25:46 +01:00
vanhofen
27b45a838a pick mipsbox code from DDT, TangoCash and max10
Origin commit data
------------------
Branch: ni/coolstream
Commit: f3f0bdaddb
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-05-03 (Fri, 03 May 2019)

Origin message was:
------------------
- pick mipsbox code from DDT, TangoCash and max10

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

------------------
This commit was generated by Migit
2019-05-03 22:50:45 +02:00
Frankenstone
310669d642 arm ci clock fix
thx DboxOldie


Origin commit data
------------------
Branch: ni/coolstream
Commit: e6408dae33
Author: Frankenstone <dampf_acc@online.de>
Date: 2018-09-06 (Thu, 06 Sep 2018)



------------------
This commit was generated by Migit
2018-09-07 00:18:49 +02:00
vanhofen
5de0c243cc Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Origin commit data
------------------
Branch: ni/coolstream
Commit: a0f93d9281
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)


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

------------------
This commit was generated by Migit
2017-09-13 15:07:03 +02:00
vanhofen
612837a196 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/gui/cam_menu.cpp
	src/gui/info_menue.cpp
	src/gui/mediaplayer.cpp
	src/gui/network_setup.cpp
	src/gui/record_setup.cpp
	src/gui/settings_manager.cpp
	src/gui/update_menue.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8d5f5578ef
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 15:05:33 +02:00
vanhofen
9b9e405f04 drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: 816de89898
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-13 13:35:23 +02:00
vanhofen
2097d7e876 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 163a6004fa
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-13 (Wed, 13 Sep 2017)



------------------
This commit was generated by Migit
2017-09-13 08:36:25 +02:00
vanhofen
274dbc2d1e drop easymenu
Origin commit data
------------------
Branch: ni/coolstream
Commit: b502ed31b9
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-12 (Tue, 12 Sep 2017)

Origin message was:
------------------
- drop easymenu

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

------------------
This commit was generated by Migit
2017-09-12 23:46:22 +02:00
vanhofen
47dcb723f0 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	src/system/helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 14473245e8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-22 (Wed, 22 Feb 2017)



------------------
This commit was generated by Migit
2017-02-22 08:29:51 +01:00
Michael Liebmann
3c7aca7949 Fix compiler format warnings
Origin commit data
------------------
Branch: ni/coolstream
Commit: e35969afe2
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-22 (Wed, 22 Feb 2017)


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

------------------
This commit was generated by Migit
2017-02-22 06:24:48 +01:00
vanhofen
afda007d95 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/Makefile.am
	src/gui/imageinfo_ni.cpp
	src/gui/movieplayer.cpp
	src/gui/update.cpp
	src/gui/videosettings.cpp
	src/system/setting_helpers.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4b934995ae
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 22:17:17 +01:00
vanhofen
4ac4e963ad Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	configure.ac
	data/fonts/Makefile.am
	src/gui/cam_menu.cpp
	src/gui/update.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 5db35f49c0
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-12 (Sun, 12 Feb 2017)



------------------
This commit was generated by Migit
2017-02-12 21:54:48 +01:00
Michael Liebmann
3664527019 neutrino: Rename hardware defined macros for coolstream stb
BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0d66899cbd
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2017-02-12 (Sun, 12 Feb 2017)

Origin message was:
------------------
neutrino: Rename hardware defined macros for coolstream stb

 BOXMODEL_NEVIS => BOXMODEL_CS_HD1
 BOXMODEL_APOLLO => BOXMODEL_CS_HD2


------------------
This commit was generated by Migit
2017-02-12 09:21:04 +01:00
vanhofen
6b0e887585 Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	data/locale/nederlands.locale
	data/locale/slovak.locale
	data/locale/unmaintained/czech.locale
	src/gui/components/cc_frm_footer.cpp
	src/gui/start_wizard.cpp
	src/gui/widget/msgbox.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: fce378f8ff
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-21 (Mon, 21 Nov 2016)



------------------
This commit was generated by Migit
2016-11-21 12:46:49 +01:00
vanhofen
a413bfb40d Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/lua/lua_misc.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3420991007
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-19 (Sat, 19 Nov 2016)



------------------
This commit was generated by Migit
2016-11-19 21:11:54 +01:00
vanhofen
6dfe9dc9ba Merge branch 'ni/tuxbox' into ni/mp/tuxbox
Conflicts:
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ddcc0c7ce
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-11-02 (Wed, 02 Nov 2016)



------------------
This commit was generated by Migit
2016-11-02 09:50:10 +01:00
Thilo Graf
1f6eefee19 Includes: remove unused includes
Origin commit data
------------------
Branch: ni/coolstream
Commit: e19536fe99
Author: Thilo Graf <dbt@novatux.de>
Date: 2016-10-26 (Wed, 26 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-26 10:25:07 +02:00
FlatTV
54c9128b89 CamMenu: add "no other CI channel" option to usable channels while recording
Origin commit data
------------------
Branch: ni/coolstream
Commit: f790f6d05d
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)


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

------------------
This commit was generated by Migit
2016-10-25 18:48:00 +02:00
vanhofen
ca5c4b00d7 Merge branch 'ni/cst-next' into ni/mp/cst-next
Conflicts:
	acinclude.m4
	src/gui/bedit/bouqueteditor_channels.cpp
	src/gui/epgplus.cpp
	src/gui/plugins.cpp
	src/gui/widget/listbox.cpp
	src/zapit/src/capmt.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7135aac394
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-10 (Mon, 10 Oct 2016)



------------------
This commit was generated by Migit
2016-10-10 17:27:55 +02:00
FlatTV
8188f332ac Cam Menu: Allow switching to all or same transponder channels
while CI recording


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe69787b0a
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-10-07 (Fri, 07 Oct 2016)



------------------
This commit was generated by Migit
2016-10-07 14:37:37 +02:00
vanhofen
af8fe3ebc6 Merge branch 'ni/mp' into ni/cst-next
Conflicts:
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/Makefile.am
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libdvbsub/dvbsub.cpp
	lib/libdvbsub/dvbsubtitle.cpp
	lib/libtuxtxt/tuxtxt.cpp
	lib/libtuxtxt/tuxtxt.h
	src/gui/dboxinfo.cpp
	src/gui/movieplayer.cpp
	src/gui/streaminfo2.cpp
	src/gui/themes.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/Makefile.am
	src/system/flashtool.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 161347db29
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-08-26 (Fri, 26 Aug 2016)



------------------
This commit was generated by Migit
2016-08-26 19:13:47 +02:00
Michael Liebmann
2c4ccf9555 Merge branch 'cst-next' into nmp-cst-next
- Fix merge conflicts


Origin commit data
------------------
Branch: ni/coolstream
Commit: 7a3c90fccf
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-08-19 (Fri, 19 Aug 2016)



------------------
This commit was generated by Migit
2016-08-19 17:40:48 +02:00
FlatTV
a334430d9f Zap when recording needs CAM
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7556db08f2
Author: FlatTV <FlatTV@gmx.de>
Date: 2016-05-31 (Tue, 31 May 2016)


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

------------------
This commit was generated by Migit
2016-05-31 22:32:04 +02:00
vanhofen
a86bc779b4 NI \o/
Origin commit data
------------------
Branch: ni/coolstream
Commit: d6b3754c6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-05-19 (Thu, 19 May 2016)


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

------------------
This commit was generated by Migit
2016-05-19 22:59:54 +02:00
Jacek Jendrzej
bc92bf0e62 avoid null pointer use
Origin commit data
------------------
Branch: ni/coolstream
Commit: 8fb4e1b78e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2016-04-21 (Thu, 21 Apr 2016)


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

------------------
This commit was generated by Migit
2016-04-21 18:14:46 +02:00
Michael Liebmann
d4947770df Fix compile neutrino-mp
Origin commit data
------------------
Branch: ni/coolstream
Commit: 821ccf34a5
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-12 (Tue, 12 Jan 2016)


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

------------------
This commit was generated by Migit
2016-01-16 07:26:04 +01:00
Stefan Seyfried
5f89c9a312 Merge remote-tracking branch 'uncool/cst-next'
This need buildfixes and some functional updates...


Origin commit data
------------------
Branch: ni/coolstream
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)



------------------
This commit was generated by Migit
2015-12-13 17:41:55 +01:00
Jacek Jendrzej
e0e1dd631c src/gui/cam_menu.cpp: fix nevis compil
Origin commit data
------------------
Branch: ni/coolstream
Commit: 715c0e383d
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-11-14 (Sat, 14 Nov 2015)


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

------------------
This commit was generated by Migit
2015-11-14 16:19:39 +01:00
[CST] Focus
973549a293 neutrino: add option to limit CI usage to selected tuner
Origin commit data
------------------
Branch: ni/coolstream
Commit: 5a8fc39ef9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-11-05 (Thu, 05 Nov 2015)


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

------------------
This commit was generated by Migit
2015-11-06 17:24:10 +03:00
[CST] Focus
29037b3941 gui/cam_menu.cpp: hack: save blind answer as pincode and re-use it if enabled
Origin commit data
------------------
Branch: ni/coolstream
Commit: 04aa958d19
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-09-24 (Thu, 24 Sep 2015)


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

------------------
This commit was generated by Migit
2015-09-24 12:32:28 +03: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
f6bb076c2c gui/cam_menu.cpp: remove extra debug
Origin commit data
------------------
Branch: ni/coolstream
Commit: 7fa0111c4b
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:42 +04:00
[CST] Focus
3d0f00c114 gui/cam_menu.cpp: rework, handle mmi timeout, close menu on CI/card insert/remove
Origin commit data
------------------
Branch: ni/coolstream
Commit: ffce0866bc
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-17 (Mon, 17 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-21 17:17:53 +04:00
[CST] Focus
8c438233fc gui/cam_menu.cpp: use dialog for menu/list messages generated outside of menu
Origin commit data
------------------
Branch: ni/coolstream
Commit: ce4552b4b9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-21 17:17:42 +04:00
[CST] Focus
ebf6b84f46 gui/cam_menu.cpp: cleanup, fix memleak when messages ignored
Origin commit data
------------------
Branch: ni/coolstream
Commit: a5f2ebaec3
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-14 (Fri, 14 Mar 2014)


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

------------------
This commit was generated by Migit
2014-03-21 17:17:32 +04:00
Jacek Jendrzej
34cb59e0a6 Revert "scan.cpp cam_menu.cpp fix Werror=format"
This reverts commit d99bf2e3e2.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 8bad5565e0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-02-21 (Fri, 21 Feb 2014)



------------------
This commit was generated by Migit
2014-02-21 17:01:43 +01:00
Jacek Jendrzej
d99bf2e3e2 scan.cpp cam_menu.cpp fix Werror=format
Origin commit data
------------------
Branch: ni/coolstream
Commit: a48d8306ec
Author: Jacek Jendrzej <overx300@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
2014-02-21 14:04:35 +01:00
Stefan Seyfried
d235d78f43 Merge remote-tracking branch 'broken/next-cc'
Origin commit data
------------------
Branch: ni/coolstream
Commit: 65437a60a8
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-28 (Tue, 28 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-28 13:22:00 +01:00
[CST] Focus
cffc44275d gui/cam_menu.cpp: handle CA_MESSAGE_MSG_CHANNEL_CHANGE msg
Origin commit data
------------------
Branch: ni/coolstream
Commit: 828f9e5856
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-28 (Tue, 28 Jan 2014)


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

------------------
This commit was generated by Migit
2014-01-28 16:16:35 +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