Merge branch 'master' into pu/mp

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@