vanhofen
ee5ff0408d
Merge branch 'master' of https://github.com/neutrino-mp/neutrino-mp into ni/mp/tuxbox
...
Conflicts:
configure.ac
data/locale/deutsch.locale
data/locale/english.locale
data/locale/slovak.locale
lib/libcoolstream/hardware_caps.cpp
lib/libcoolstream/hardware_caps.h
lib/libdvbsub/dvbsubtitle.cpp
lib/timerdclient/timerdclient.cpp
src/daemonc/Makefile.am
src/daemonc/remotecontrol.cpp
src/driver/framebuffer_ng.h
src/driver/pictureviewer/Makefile.am
src/driver/streamts.cpp
src/eitd/sectionsd.cpp
src/gui/bedit/bouqueteditor_channels.cpp
src/gui/dboxinfo.cpp
src/gui/epgplus.cpp
src/gui/epgview.cpp
src/gui/plugins.cpp
src/gui/streaminfo2.cpp
src/gui/themes.cpp
src/gui/widget/listbox.cpp
src/gui/widget/listhelpers.cpp
src/neutrino.cpp
src/system/helpers.cpp
src/system/helpers.h
src/system/settings.cpp
src/system/settings.h
src/zapit/src/getservices.cpp
Origin commit data
------------------
Commit: 75cce3b113vanhofen@gmx.de >
Date: 2016-10-25 (Tue, 25 Oct 2016)
2016-10-25 13:08:01 +02:00
Michael Liebmann
5d1176266a
libcoolstream: Add boxarch to hw_caps
...
Origin commit data
------------------
Commit: 514d6344a6tuxcode.bbg@gmail.com >
Date: 2016-01-25 (Mon, 25 Jan 2016)
2016-01-25 13:53:39 +01:00
Stefan Seyfried
830b755fa8
hardware_caps: more boxtypes, add boxarch
...
Origin commit data
------------------
Commit: 71d4ec8339seife@tuxbox-git.slipkontur.de >
Date: 2016-01-22 (Fri, 22 Jan 2016)
2016-01-22 19:48:09 +01:00
Michael Liebmann
48e4e8cba8
Adapt neutrino-mp for CST hardware part #3
...
- Adapt and extend hw_caps for cst hardware
Origin commit data
------------------
Commit: fe9a2c19e4tuxcode.bbg@gmail.com >
Date: 2016-01-15 (Fri, 15 Jan 2016)
2016-01-16 07:26:04 +01:00
Stefan Seyfried
a7f23d76ba
hw_caps: fix compile on coolstream
...
Origin commit data
------------------
Commit: 1ae305953cseife@tuxbox-git.slipkontur.de >
Date: 2012-11-10 (Sat, 10 Nov 2012)
2012-11-10 22:53:48 +01:00
