mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 07:22:57 +02:00
Code Issues Packages Projects Releases Wiki Activity
10,777 Commits 2 Branches 9 Tags
6c8156c80c268924e574e4b50c96b60e9306bae0
Commit Graph

5 Commits

Author SHA1 Message Date
vanhofen
8474ef8c98 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
------------------
Branch: ni/coolstream
Commit: 75cce3b113
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
 2016-10-25 13:08:01 +02:00
Michael Liebmann
b7d36e8aec libcoolstream: Add boxarch to hw_caps 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 514d6344a6
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-25 (Mon, 25 Jan 2016)


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

------------------
This commit was generated by Migit
 2016-01-25 13:53:39 +01:00
Stefan Seyfried
2480799caf hardware_caps: more boxtypes, add boxarch 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 71d4ec8339
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-22 (Fri, 22 Jan 2016)


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

------------------
This commit was generated by Migit
 2016-01-22 19:48:09 +01:00
Michael Liebmann
bf7e117cef Adapt neutrino-mp for CST hardware part #3 
- Adapt and extend hw_caps for cst hardware


Origin commit data
------------------
Branch: ni/coolstream
Commit: fe9a2c19e4
Author: Michael Liebmann <tuxcode.bbg@gmail.com>
Date: 2016-01-15 (Fri, 15 Jan 2016)



------------------
This commit was generated by Migit
 2016-01-16 07:26:04 +01:00
Stefan Seyfried
19000c33bd hw_caps: fix compile on coolstream 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 1ae305953c
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2012-11-10 (Sat, 10 Nov 2012)


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

------------------
This commit was generated by Migit
 2012-11-10 22:53:48 +01:00