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

Origin commit data
------------------
Branch: ni/coolstream
Commit: be308c82f8
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-03-28 (Tue, 28 Mar 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-03-28 21:29:30 +02:00
24 changed files with 7814 additions and 7155 deletions

View File

@@ -12,7 +12,7 @@ AM_CPPFLAGS += \
-I$(top_srcdir)/lib/connection \
-I$(top_srcdir)/lib/xmltree \
-I$(top_srcdir)/lib/libupnpclient \
-I$(top_srcdir)/lib/jsoncpp/include \
-I$(top_srcdir)/lib/jsoncpp \
@SIGC_CFLAGS@ \
@CURL_CFLAGS@ \
@FREETYPE_CFLAGS@ \