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

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

Browse Source 
Conflicts:
	src/driver/rcinput.cpp
	src/gui/audioplayer.cpp
	src/gui/moviebrowser/mb.cpp


Origin commit data
------------------
Commit: a58f2cc447
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-25 (Mon, 25 Sep 2017)
This commit is contained in:
vanhofen
2017-09-25 11:36:34 +02:00
parent 4681ed01cb 3c6d8b4f5c
commit 0d9a80486a
37 changed files with 122 additions and 732 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/daemonc/Makefile.am
View File

@@ -13,6 +13,7 @@ AM_CPPFLAGS += \
@SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@LUA_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libneutrino_daemonc.a