Commit Graph

8 Commits

Author SHA1 Message Date
BPanther
c1ba54dde2 more s2x stuff
Origin commit data
------------------
Branch: ni/coolstream
Commit: 674e842687
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2019-12-31 (Tue, 31 Dec 2019)


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

------------------
This commit was generated by Migit
2019-12-31 00:25:09 +01:00
vanhofen
5cb09db847 Revert "s2x changes (thx Janus)"
This reverts commit 069ee72b89
because it doesn't want build.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2b72ddc10d
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-10-30 (Wed, 30 Oct 2019)



------------------
This commit was generated by Migit
2019-10-30 22:59:59 +01:00
BPanther
069ee72b89 s2x changes (thx Janus)
Origin commit data
------------------
Branch: ni/coolstream
Commit: ac360c7bea
Author: BPanther <bpanther_ts@hotmail.com>
Date: 2019-10-30 (Wed, 30 Oct 2019)


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

------------------
This commit was generated by Migit
2019-10-30 22:37:58 +01:00
vanhofen
33298bd925 Revert "- simplify some more USE_STB_HAL defines"
This reverts commit 82a9223e1a because
the private linux dvb headers were changed by mistake.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 2de2cdde23
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-26 (Wed, 26 Dec 2018)



------------------
This commit was generated by Migit
2018-12-26 23:11:15 +01:00
vanhofen
82a9223e1a simplify some more USE_STB_HAL defines
Origin commit data
------------------
Branch: ni/coolstream
Commit: 591b34eb42
Author: vanhofen <vanhofen@gmx.de>
Date: 2018-12-26 (Wed, 26 Dec 2018)

Origin message was:
------------------
- simplify some more USE_STB_HAL defines

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

------------------
This commit was generated by Migit
2018-12-26 22:42:57 +01:00
Stefan Seyfried
e4e9fb1e46 Merge remote-tracking branch 'test/cst-next'
Conflicts:
	src/gui/osdlang_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 48fdfc5e5e
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2015-02-19 (Thu, 19 Feb 2015)



------------------
This commit was generated by Migit
2015-02-19 14:10:26 +01:00
Stefan Seyfried
c8e3ec41a9 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
------------------
Branch: ni/coolstream
Commit: 69c4dbbdba
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-12-25 (Thu, 25 Dec 2014)



------------------
This commit was generated by Migit
2014-12-25 18:03:08 +01:00
Stefan Seyfried
6c5f59db5e disable private copy of the linux dvb headers
Move them into subdir private so that they are no longer used by
default. They still can be used by extending the include path.


Origin commit data
------------------
Branch: ni/coolstream
Commit: 945452e35a
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2014-02-16 (Sun, 16 Feb 2014)



------------------
This commit was generated by Migit
2014-02-16 13:14:41 +01:00