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

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

Browse Source 
Conflicts:
	configure.ac
	lib/Makefile.am
	src/Makefile.am


Origin commit data
------------------
Branch: ni/coolstream
Commit: 3ed2ebe75b
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-10-25 (Tue, 25 Oct 2016)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2016-10-25 12:30:10 +02:00
parent e6e7bed4b6 01acc7d9ae
commit 59c83b2c70
21 changed files with 264 additions and 86 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
lib/libdvbsub/Makefile.am
View File

@@ -4,6 +4,7 @@ AM_CPPFLAGS = \
-I$(top_srcdir)/src \
-I$(top_srcdir)/src/zapit/include \
@AVFORMAT_CFLAGS@ \
@SIGC_CFLAGS@ \
@HWLIB_CFLAGS@
AM_CPPFLAGS += -fno-rtti -fno-exceptions