Merge remote-tracking branch 'tuxbox/master'

Origin commit data
------------------
Branch: ni/coolstream
Commit: a409047714
Author: Stefan Seyfried <seife@tuxbox-git.slipkontur.de>
Date: 2017-01-22 (Sun, 22 Jan 2017)


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

------------------
This commit was generated by Migit

configure.ac

@@ -297,65 +297,82 @@ AC_SUBST(BLURAY_LIBS)
 
 AC_OUTPUT([
 Makefile
+data/Makefile
+data/fonts/Makefile
+data/icons/Makefile
+data/icons/buttons/Makefile
+data/icons/filetypes/Makefile
+data/icons/headers/Makefile
+data/icons/hints/Makefile
+data/icons/locale/Makefile
+data/icons/movieplayer/Makefile
+data/icons/radar/Makefile
+data/icons/slider/Makefile
+data/icons/status/Makefile
+data/icons/status/ca/Makefile
+data/icons/status/channel/Makefile
+data/icons/status/markers/Makefile
+data/icons/status/various/Makefile
+data/icons/various/Makefile
+data/inetradio/Makefile
+data/initial/Makefile
+data/iso-codes/Makefile
+data/lcd/Makefile
+data/lcd/clock/Makefile
+data/lcd/icons/Makefile
+data/license/Makefile
+data/locale/Makefile
+data/neutrino-scripts/Makefile
+data/pictures/Makefile
+data/pictures/backgrounds/Makefile
+data/pictures/screensaver/Makefile
+data/scripts/Makefile
+data/themes/Makefile
+data/y-web/Makefile
+data/y-web/images/Makefile
+data/y-web/languages/Makefile
+data/y-web/scripts/Makefile
+data/y-web/styles/Makefile
 lib/Makefile
-lib/libconfigfile/Makefile
 lib/connection/Makefile
+lib/jsoncpp/Makefile
+lib/libconfigfile/Makefile
+lib/libcoolstream/Makefile
+lib/libdvbsub/Makefile
 lib/libeventserver/Makefile
+lib/libiw/Makefile
 lib/libmd5sum/Makefile
 lib/libnet/Makefile
-lib/xmltree/Makefile
-lib/jsoncpp/Makefile
+lib/libtuxtxt/Makefile
+lib/libupnpclient/Makefile
+lib/luaclient/Makefile
 lib/sectionsdclient/Makefile
 lib/timerdclient/Makefile
-lib/libcoolstream/Makefile
-lib/libtuxtxt/Makefile
-lib/libdvbsub/Makefile
-lib/libupnpclient/Makefile
-lib/libiw/Makefile
-lib/luaclient/Makefile
-src/lcddisplay/Makefile
-src/nhttpd/Makefile
-src/nhttpd/web/Makefile
-src/nhttpd/web/images/Makefile
-src/nhttpd/web/scripts/Makefile
-src/nhttpd/web/languages/Makefile
-src/nhttpd/web/styles/Makefile
-src/nhttpd/tuxboxapi/Makefile
-src/nhttpd/yhttpd_core/Makefile
-src/nhttpd/yhttpd_mods/Makefile
-src/nhttpd/nhttpd.conf
+lib/xmltree/Makefile
 src/Makefile
 src/daemonc/Makefile
-src/driver/pictureviewer/Makefile
-src/driver/audiodec/Makefile
 src/driver/Makefile
+src/driver/audiodec/Makefile
+src/driver/pictureviewer/Makefile
+src/eitd/Makefile
 src/gui/Makefile
 src/gui/bedit/Makefile
 src/gui/components/Makefile
 src/gui/lua/Makefile
 src/gui/moviebrowser/Makefile
 src/gui/widget/Makefile
+src/lcddisplay/Makefile
+src/nhttpd/Makefile
+src/nhttpd/nhttpd.conf
+src/nhttpd/tuxboxapi/Makefile
+src/nhttpd/yhttpd_core/Makefile
+src/nhttpd/yhttpd_mods/Makefile
 src/system/Makefile
 src/system/mtdutils/Makefile
 src/system/mtdutils/lib/Makefile
-data/Makefile
-data/fonts/Makefile
-data/icons/Makefile
-data/inetradio/Makefile
-data/initial/Makefile
-data/iso-codes/Makefile
-data/lcd/Makefile
-data/lcd/icons/Makefile
-data/lcd/clock/Makefile
-data/license/Makefile
-data/locale/Makefile
-data/neutrino-scripts/Makefile
-data/scripts/Makefile
-data/themes/Makefile
-src/eitd/Makefile
 src/timerd/Makefile
 src/zapit/Makefile
+src/zapit/data/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
-src/zapit/data/Makefile
 ])