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 'pu/mp' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	data/locale/english.locale
	data/pictures/backgrounds/1280x720/shutdown.jpg
	src/Makefile.am
	src/zapit/src/frontend.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 40e46a0df3
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-15 (Wed, 15 Mar 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-15 23:45:02 +01:00
parent 45f0ad7d7e 8073cfc4d6
commit 26e23762ca
10 changed files with 25 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -129,6 +129,7 @@ if test "$BOXTYPE" = "coolstream"; then
fi
if test "$BOXTYPE" = "coolstream" ||
test "$BOXTYPE" = "generic" ||
test "$BOXTYPE" = "tripledragon" ||
test "$BOXTYPE" = "spark"; then
AC_DEFINE(SCREENSHOT,1,[Define to 1 if the platform supports screenshots])