mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-09-11 07:30:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
14,007 Commits 2 Branches 9 Tags
f696dcaec3b65ba98eabf5bb0724379ebb5f15f7
Commit Graph

280 Commits

Author SHA1 Message Date
Stefan Seyfried
17880c4125 Merge remote-tracking branch 'uncool/cst-next' 
This need buildfixes and some functional updates...


Origin commit data
------------------
Commit: eeee5bacab
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-12-13 (Sun, 13 Dec 2015)
 2015-12-13 17:41:55 +01:00
vanhofen
f8220aae33 record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk) 
Origin commit data
------------------
Commit: bab181ab5b
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-21 (Wed, 21 Oct 2015)

Origin message was:
------------------
- record.cpp: align CODEC_ID defines to current ffmpeg code (thx to flk)
 2015-10-21 11:55:48 +02:00
vanhofen
b537a7a389 record.cpp: remove unnecessary executable flag from ts-file 
Origin commit data
------------------
Commit: 07df9d28e5
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-14 (Wed, 14 Oct 2015)

Origin message was:
------------------
- record.cpp: remove unnecessary executable flag from ts-file
 2015-10-14 13:11:08 +02:00
vanhofen
cb3644e86c record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file 
Origin commit data
------------------
Commit: be2c0a44cd
Author: vanhofen <vanhofen@gmx.de>
Date: 2015-10-14 (Wed, 14 Oct 2015)

Origin message was:
------------------
- record.cpp: resort flags for xml-file and ts-file; add O_CLOEXEC to ts-file
 2015-10-14 13:08:20 +02:00
[CST] Focus
623f606408 driver/record.cpp: add expetimental support for webtv recording, 
allowed formats hls and mpegts, ffmpeg must have mpegts muxer support


Origin commit data
------------------
Commit: f0eac5d3e0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-10-07 (Wed, 07 Oct 2015)
 2015-10-07 13:48:46 +03:00
Jacek Jendrzej
42fc47aee3 src/gui/eventlist.cpp fix timeshif_record timer handling 
Origin commit data
------------------
Commit: 65a237c991
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2015-08-20 (Thu, 20 Aug 2015)
 2015-08-20 15:51:57 +02:00
Stefan Seyfried
d9354e847f global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 5ab6b53054
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-04-16 (Thu, 16 Apr 2015)
 2015-04-16 13:39:35 +02:00
Stefan Seyfried
30eb1a1ced Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/gui/epgview.cpp


Origin commit data
------------------
Commit: 66adad0811
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-07 (Sat, 07 Feb 2015)
 2015-02-07 23:12:01 +01:00
[CST] Focus
96c523a0c2 eitd: as long as neutrino using only first content classification, 
reduce content classification caching (leaving old code with ifdef)


Origin commit data
------------------
Commit: e8700de2b7
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-30 (Fri, 30 Jan 2015)
 2015-01-30 19:47:30 +03:00
Stefan Seyfried
a968a12b8d Merge remote-tracking branch 'check/cst-next' 
*needs buildfixing*

Conflicts:
	src/daemonc/Makefile.am
	src/daemonc/remotecontrol.cpp
	src/driver/Makefile.am
	src/driver/audiodec/Makefile.am
	src/driver/pictureviewer/Makefile.am
	src/driver/vfd.cpp
	src/gui/bedit/Makefile.am
	src/gui/components/Makefile.am
	src/gui/luainstance.cpp
	src/gui/widget/Makefile.am
	src/nhttpd/tuxboxapi/coolstream/Makefile.am
	src/system/Makefile.am


Origin commit data
------------------
Commit: b5a64e6887
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-01-26 (Mon, 26 Jan 2015)
 2015-01-26 17:26:26 +01:00
[CST] Focus
d65606a2b4 neutrino.cpp: try to fix timeshift stop/restart, 
after quit from playback audioplayer, picture viewer and so on


Origin commit data
------------------
Commit: ecff984432
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-21 (Wed, 21 Jan 2015)
 2015-01-21 18:00:25 +03:00
[CST] Focus
3ee0b2dd65 driver/record.cpp: fix crash due to epgdata.info1 len more than buffer size 
Origin commit data
------------------
Commit: cbdab7d8c0
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2015-01-14 (Wed, 14 Jan 2015)
 2015-01-14 12:46:09 +03:00
Stefan Seyfried
d1e2143fd6 Merge remote-tracking branch 'check/cst-next' 
Conflicts:
	src/daemonc/remotecontrol.cpp
	src/gui/luainstance.cpp
	src/gui/movieplayer.cpp
	src/gui/videosettings.cpp
	src/neutrino.cpp
	src/system/setting_helpers.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: d37b3c0f9a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-28 (Sun, 28 Dec 2014)
 2014-12-28 12:32:12 +01:00
Stefan Seyfried
ec1a9fce17 Merge remote-tracking branch 'check/cst-next' 
needs build- and functional fixes

Conflicts:
	configure.ac
	data/icons/shutdown.jpg
	data/icons/start.jpg
	data/locale/deutsch.locale
	data/locale/english.locale
	lib/libmd5sum/md5.c
	src/driver/scanepg.cpp
	src/driver/streamts.cpp
	src/driver/vfd.cpp
	src/driver/vfd.h
	src/driver/volume.cpp
	src/eitd/dmx.cpp
	src/eitd/xmlutil.cpp
	src/gui/Makefile.am
	src/gui/audiomute.cpp
	src/gui/channellist.cpp
	src/gui/dboxinfo.cpp
	src/gui/epgview.cpp
	src/gui/eventlist.cpp
	src/gui/filebrowser.cpp
	src/gui/hdd_menu.cpp
	src/gui/infoviewer.cpp
	src/gui/infoviewer_bb.cpp
	src/gui/infoviewer_bb.h
	src/gui/keybind_setup.cpp
	src/gui/luainstance.cpp
	src/gui/luainstance.h
	src/gui/miscsettings_menu.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieplayer.cpp
	src/gui/osd_progressbar_setup.cpp
	src/gui/osd_progressbar_setup.h
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/personalize.cpp
	src/gui/plugins.cpp
	src/gui/plugins.h
	src/gui/scan.cpp
	src/gui/scan_setup.cpp
	src/gui/update_settings.cpp
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/gui/videosettings.cpp
	src/gui/widget/buttons.cpp
	src/gui/widget/menue.cpp
	src/gui/widget/menue.h
	src/gui/widget/progresswindow.cpp
	src/neutrino.cpp
	src/neutrino_menue.cpp
	src/nhttpd/yhttpd.cpp
	src/system/helpers.cpp
	src/system/locals.h
	src/system/locals_intern.h
	src/system/setting_helpers.cpp
	src/zapit/lib/zapitclient.cpp
	src/zapit/src/fastscan.cpp
	src/zapit/src/frontend.cpp
	src/zapit/src/getservices.cpp
	src/zapit/src/scan.cpp
	src/zapit/src/scannit.cpp
	src/zapit/src/scanpmt.cpp
	src/zapit/src/transponder.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)
 2014-12-25 18:03:08 +01:00
Jacek Jendrzej
5fcef17edf try to fix segfault on webtv channel - neutrino shutdown 
Origin commit data
------------------
Commit: b22625aa36
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-11-13 (Thu, 13 Nov 2014)

Origin message was:
------------------
-try to fix segfault on webtv channel - neutrino shutdown
 2014-11-13 15:38:30 +01:00
[CST] Focus
023891d538 Revert "driver/record: auto-terminate temporary timeshift recordings" 
commit can stop plain record instead of timeshift, and breaks auto-timeshift concept

This reverts commit f6fbd1d488.


Origin commit data
------------------
Commit: 6ad1a64f73
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-10-01 (Wed, 01 Oct 2014)
 2014-10-01 16:10:36 +04:00
martii
aaad1652e8 driver/record: CRecordInstance::MakeExtFileName(): set dummy values on EPG failure 
Origin commit data
------------------
Commit: 9cd4af2dd2
Author: martii <m4rtii@gmx.de>
Date: 2014-09-21 (Sun, 21 Sep 2014)
 2014-09-29 14:36:10 +04:00
martii
edebc84cd3 MI_MOVIE_INFO: add constructor 
Conflicts:
	src/driver/record.cpp
	src/gui/moviebrowser.cpp
	src/gui/movieinfo.cpp
	src/gui/movieplayer.cpp


Origin commit data
------------------
Commit: e611ed381d
Author: martii <m4rtii@gmx.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-09-25 14:44:53 +04:00
martii
0ed0c15b3e check for active downloads before shutting down; indicate dl on vfd 
Conflicts:
	data/locale/deutsch.locale
	data/locale/english.locale
	src/driver/lcdd.h
	src/driver/simple_display.cpp
	src/neutrino.cpp
	src/system/locals.h
	src/system/locals_intern.h


Origin commit data
------------------
Commit: a3adf2798a
Author: martii <m4rtii@gmx.de>
Date: 2013-12-15 (Sun, 15 Dec 2013)
 2014-09-24 19:50:35 +04:00
martii
69f917f16d drop explicit CMenuForwarder icon assignments 
Conflicts:
	src/gui/3dsetup.cpp
	src/gui/bouquetlist.cpp
	src/gui/hdd_menu.cpp
	src/gui/keybind_setup.cpp
	src/gui/mediaplayer.cpp
	src/gui/mediaplayer_setup.cpp
	src/gui/moviebrowser.cpp
	src/gui/network_setup.cpp
	src/gui/nfs.cpp
	src/gui/osd_setup.cpp
	src/gui/osdlang_setup.cpp
	src/gui/parentallock_setup.cpp
	src/gui/personalize.cpp
	src/gui/proxyserver_setup.cpp
	src/gui/record_setup.cpp
	src/gui/scan_setup.cpp
	src/gui/screensetup.cpp
	src/gui/settings_manager.cpp
	src/gui/timerlist.cpp
	src/gui/update_menue.cpp
	src/gui/vfd_setup.cpp
	src/gui/videosettings.cpp
	src/neutrino_menue.cpp


Origin commit data
------------------
Commit: e84782bc4c
Author: martii <m4rtii@gmx.de>
Date: 2014-02-22 (Sat, 22 Feb 2014)
 2014-09-15 11:44:08 +04:00
[CST] Focus
8f7f3f9e4d webtv channels integration port, 
initial code (C) martii,
initial patch from jacek


Origin commit data
------------------
Commit: a473fe8194
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-08-27 (Wed, 27 Aug 2014)
 2014-08-27 17:32:26 +04:00
[CST] Focus
958139cd31 merge neutrino-mp menu/buttons/icons changes, (C) martii 
Origin commit data
------------------
Commit: cf91f2eccb
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-07-17 (Thu, 17 Jul 2014)
 2014-07-17 17:02:25 +04:00
martii
f6fbd1d488 driver/record: auto-terminate temporary timeshift recordings 
Origin commit data
------------------
Commit: c9d78e1a9c
Author: martii <m4rtii@gmx.de>
Date: 2014-07-06 (Sun, 06 Jul 2014)
 2014-07-07 08:35:12 +02:00
[CST] Focus
1032d0a273 driver/record.cpp: create record directory before record 
Origin commit data
------------------
Commit: 3124ed62cf
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-05-30 (Fri, 30 May 2014)
 2014-06-03 13:24:04 +04:00
Jacek Jendrzej
782e666f68 add h265 to record and stream 
Origin commit data
------------------
Commit: d9483e019e
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-05-29 (Thu, 29 May 2014)

Origin message was:
------------------
-add h265 to record and stream
 2014-05-29 16:23:36 +02:00
Stefan Seyfried
3f36062fe7 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
------------------
Commit: 44ba8fafca
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-04-27 (Sun, 27 Apr 2014)
 2014-04-27 19:14:06 +02:00
FlatTV
dfd972bfe7 record menu: add filename template 
Origin commit data
------------------
Commit: e0055b5339
Author: FlatTV <FlatTV@gmx.de>
Date: 2014-03-13 (Thu, 13 Mar 2014)
 2014-03-14 09:39:57 +01:00
[CST] Focus
d71bac1ed0 driver/record.cpp: always use configured hours to record for temporary timeshift; 
cleanup unused code


Origin commit data
------------------
Commit: 8074000b23
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-03-11 (Tue, 11 Mar 2014)
 2014-03-11 16:22:50 +04:00
Stefan Seyfried
d06c1d8ad6 Merge remote-tracking branch 'check/next-cc' 
...only build-tested, needs fixes


Origin commit data
------------------
Commit: ecd62d81d1
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-15 (Sat, 15 Feb 2014)
 2014-02-15 20:22:07 +01:00
[CST] Focus
1a8fd9bec3 driver/record.cpp: use wakeup_hdd(); 
save xml before record start


Origin commit data
------------------
Commit: ee38ad2750
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-12 (Wed, 12 Feb 2014)
 2014-02-12 16:47:29 +04:00
[CST] Focus
d6e6c99080 driver/record.cpp: try to flush hdd buffers, if hdd is in standby at record start 
Origin commit data
------------------
Commit: 3d3e169f1e
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-02-05 (Wed, 05 Feb 2014)
 2014-02-05 14:02:46 +04:00
[CST] Focus
693691124f driver/record.cpp: dont show menu after timeshift stop, if timeshift record already stopped 
Origin commit data
------------------
Commit: 2d683fe4c9
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2014-01-29 (Wed, 29 Jan 2014)
 2014-01-29 17:19:00 +04:00
Stefan Seyfried
a112e8fb49 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
------------------
Commit: b414474323
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-23 (Thu, 23 Jan 2014)
 2014-01-23 14:08:37 +01:00
vanhofen
8d5aa84e20 adapt ShowMsg handling from martii's neutrino-mp 
Origin commit data
------------------
Commit: 53f5801d6f
Author: vanhofen <vanhofen@gmx.de>
Date: 2014-01-22 (Wed, 22 Jan 2014)

Origin message was:
------------------
- adapt ShowMsg handling from martii's neutrino-mp
 2014-01-22 12:37:21 +01:00
vanhofen
8a02f4f089 adapt ShowHint handling from martii's neutrino-mp 
Origin commit data
------------------
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
 2014-01-22 12:11:52 +01:00
Michael Liebmann
1918153c0a Preparing the menu classes for Lua Part #2 
- Remove CMenuForwarderNonLocalized
- Add overloaded function CMenuForwarder for non local
 THX Martii


Origin commit data
------------------
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
 2014-01-19 20:57:37 +01:00
Stefan Seyfried
13ac3b81eb Merge remote-tracking branch 'check/next-cc' 
Conflicts:
	src/neutrino.cpp


Origin commit data
------------------
Commit: eca8f5459b
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-19 (Sun, 19 Jan 2014)
 2014-01-19 13:37:24 +01:00
Jacek Jendrzej
d7e91e68f6 CRecordInstance::FillMovieInfo supplement to 74310d137a , check current epg before we take title from timer 
Origin commit data
------------------
Commit: 14580b1dd1
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-18 (Sat, 18 Jan 2014)
 2014-01-18 19:58:40 +01:00
Jacek Jendrzej
74310d137a CRecordInstance::FillMovieInfo: -fix epg title if epgid removed http://www.dbox2world.net/board293-cst-coolstream/board314-cst-coolstream-development/12026-probleme-mit-timeraufnahme/ 
Origin commit data
------------------
Commit: 9455b0eeda
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2014-01-16 (Thu, 16 Jan 2014)
 2014-01-16 20:58:14 +01:00
Stefan Seyfried
607f56ae80 reduce direct dependencies on timerdclient.h 
Include timerdtypes.h instead of timerdclient.h where feasible, add direct instead of indirect includes of timerdclient.h where necessary. This reduces the number of files which depend on timerdclient.h from 134 to 16. Add/update copyright notices in the affected files.


Origin commit data
------------------
Commit: 1d0a23dbf3
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-13 (Mon, 13 Jan 2014)
 2014-01-13 21:01:26 +01:00
Michael Liebmann
b3ef258294 CRecordInstance: Turns message when recording start/end on or off 
Origin commit data
------------------
Commit: ae2a01a37a
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2014-01-13 (Mon, 13 Jan 2014)
 2014-01-13 19:42:46 +01:00
Stefan Seyfried
a7b2bd7faf reduce direct dependencies on timerdclient.h 
Include timerdtypes.h instead of timerdclient.h where feasible,
add direct instead of indirect includes of timerdclient.h where
necessary. This reduces the number of files which depend on
timerdclient.h from 134 to 16.
Add/update copyright notices in the affected files.


Origin commit data
------------------
Commit: ed818c7c14
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-01-12 (Sun, 12 Jan 2014)
 2014-01-12 16:55:31 +01:00
Stefan Seyfried
ccc691278c Merge remote-tracking branch 'check/next-cc' 
Lightly tested only...


Origin commit data
------------------
Commit: cdd065fc2e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-12-25 (Wed, 25 Dec 2013)
 2013-12-25 22:51:23 +01:00
martii
ce44d1641a convert most char[...] configuration values to std::string 
Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>


Origin commit data
------------------
Commit: cbc9299df8
Author: martii <m4rtii@gmx.de>
Date: 2013-06-11 (Tue, 11 Jun 2013)
 2013-12-25 12:08:14 +01:00
vanhofen
d6c1108d7e Revert "global.h: Use forward-declarations to reduce number of dependencies" 
This reverts commit f2a2e699c2.


Origin commit data
------------------
Commit: 3c8d47fa49
Author: vanhofen <vanhofen@gmx.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 23:40:16 +01:00
Stefan Seyfried
261ea85af6 Merge branch 'check/next-cc' 
Only compile-tested.


Origin commit data
------------------
Commit: 548448456a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 14:04:15 +01:00
Stefan Seyfried
f2a2e699c2 global.h: Use forward-declarations to reduce number of dependencies 
Origin commit data
------------------
Commit: 4bc6e43ad4
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-11-13 (Wed, 13 Nov 2013)
 2013-11-13 10:40:03 +01:00
[CST] Focus
d46cfee72d driver/record.cpp: save added pids from pmt update; 
add safe-check for max pids recorded


Origin commit data
------------------
Commit: 545f1dee6a
Author: [CST] Focus <focus.cst@gmail.com>
Date: 2013-11-11 (Mon, 11 Nov 2013)
 2013-11-11 14:07:03 +04:00
martii
1000ab9237 global.h: Use forward-declarations to reduce number of dependencies 
[seife: amended to fix build]

Signed-off-by: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>


Origin commit data
------------------
Commit: 4eb66ba4b2
Author: martii <m4rtii@gmx.de>
Date: 2013-11-09 (Sat, 09 Nov 2013)
 2013-11-09 17:03:03 +01:00
Stefan Seyfried
e6cbfe61bc 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
------------------
Commit: d244a5991a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2013-10-21 (Mon, 21 Oct 2013)
 2013-10-21 22:58:55 +02:00