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

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

Browse Source 
Conflicts:
	src/Makefile.am
	src/neutrino.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: 4a07c24174
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-02-28 (Tue, 28 Feb 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-02-28 16:55:39 +01:00
parent dff4ea2892 bf56f9f0bc
commit 5e5451332e
27 changed files with 348 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
configure.ac
View File

@@ -310,6 +310,7 @@ AC_SUBST(STB_HAL_LIB)
AC_SUBST(LUA_CFLAGS)
AC_SUBST(LUA_LIBS)
AC_SUBST(BLURAY_LIBS)
AC_SUBST(LIBCOOLSTREAM_STATIC_DIR)
AC_OUTPUT([
Makefile