Merge branch 'master' into pu/mp

Origin commit data
------------------
Branch: ni/coolstream
Commit: b7ceb705a0
Author: Jacek Jendrzej <overx300@gmail.com>
Date: 2017-09-26 (Tue, 26 Sep 2017)


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

------------------
This commit was generated by Migit
This commit is contained in:
Jacek Jendrzej
2017-09-26 12:52:04 +02:00
52 changed files with 1130 additions and 892 deletions

View File

@@ -13,6 +13,7 @@ AM_CPPFLAGS += \
@SIGC_CFLAGS@ \
@FREETYPE_CFLAGS@ \
@AVFORMAT_CFLAGS@ \
@LUA_CFLAGS@ \
@HWLIB_CFLAGS@