mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 09:21:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
Files
3cf2a4dbfb6c2d520c329a11b13ca80e8830b88f
recycled-ni-neutrino/data
History
vanhofen 92be9bf775 Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox 
Conflicts:
	ChangeLog
	configure.ac
	data/locale/deutsch.locale
	data/locale/english.locale
	src/gui/filebrowser.cpp
	src/gui/filebrowser.h
	src/gui/mediaplayer.cpp
	src/gui/movieplayer.cpp
	src/gui/movieplayer.h
	src/gui/user_menue.cpp
	src/gui/user_menue_setup.cpp
	src/neutrino.cpp
	src/system/settings.h


Origin commit data
------------------
Branch: ni/coolstream
Commit: 0caa10ef43
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-21 (Thu, 21 Dec 2017)



------------------
This commit was generated by Migit
2017-12-21 22:28:12 +01:00
..
fonts
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox
2017-11-02 23:25:41 +01:00
icons
Icons: use fixed language and youtube icon
2017-12-18 22:24:48 +01:00
inetradio
radio-stations.xml: add some Radio BOB! streams
2017-09-25 11:25:52 +02:00
initial
…
iso-codes
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
2017-12-07 12:17:23 +01:00
lcd
…
license
NI \o/
2016-05-19 22:59:54 +02:00
locale
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
2017-12-21 22:28:12 +01:00
neutrino-scripts
flash.start: minor changes in script comments
2017-11-23 17:23:01 +01:00
pictures
use bootlogo in gray color
2017-10-20 08:02:09 +02:00
scripts
add webradio; first steps
2017-11-03 09:36:19 +01:00
themes
themes: add new shadow-color to our material themes
2017-08-12 13:51:00 +02:00
webtv
add hd51; mostly ported from TangoCash's neutrino-mp
2017-10-29 18:31:30 +01:00
y-web
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
2017-12-07 12:17:23 +01:00
bad_package_pattern.list.sample
…
cables.xml
cablex.xml: add OstTelCom; thx to elstablo
2017-11-25 21:20:24 +01:00
encoding.conf
…
epglanguages.conf
data: add missing epglanguages.conf
2017-10-29 18:32:21 +01:00
epgmap.xml
add epg remaping
2016-05-10 14:00:37 +02:00
Makefile.am
Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox
2017-11-16 22:05:24 +01:00
mk_terrestrial_xml.pl
…
providermap.xml
…
satellites.xml
data/satellites.xml update Astra19 Hotbird13
2016-04-18 17:55:02 +02:00
settingsupdate.conf
NI \o/
2016-05-19 22:59:54 +02:00
terrestrial.xml
…
tobackup.conf
NI \o/
2016-05-19 22:59:54 +02:00
webradio_usr.xml
webradio_usr.xml: add link to stompfm.de
2017-12-10 19:56:11 +01:00
webtv_usr.xml
add hd51; mostly ported from TangoCash's neutrino-mp
2017-10-29 18:31:30 +01:00