mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-26 23:13:00 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'ni/tuxbox' into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/driver/streamts.cpp
	src/eitd/sectionsd.cpp
	src/zapit/src/zapit.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 17546e7ba1
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-06-10 (Sat, 10 Jun 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-06-10 11:43:50 +02:00
parent 6755871162 1fc432032a
commit 5a43934c6b
40 changed files with 122 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -351,7 +351,6 @@ data/icons/status/ca/Makefile
data/icons/status/channel/Makefile
data/icons/status/info/Makefile
data/icons/status/markers/Makefile
data/icons/status/progress/Makefile
data/icons/status/various/Makefile
data/icons/various/Makefile
data/inetradio/Makefile