Merge remote-tracking branch 'cst-next'

Origin commit data
------------------
Branch: ni/coolstream
Commit: 572de2bbcb
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2016-01-16 (Sat, 16 Jan 2016)


------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
Stefan Seyfried
2016-01-16 12:51:04 +01:00
31 changed files with 148 additions and 119 deletions

View File

@@ -11,12 +11,11 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/libnet \
-I$(top_srcdir)/lib/xmltree \
@SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@
AM_CPPFLAGS += \
@FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@HWLIB_CFLAGS@
noinst_LIBRARIES = libneutrino_daemonc.a
libneutrino_daemonc_a_SOURCES = remotecontrol.cpp