Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/tuxbox

Conflicts:
	configure.ac


Origin commit data
------------------
Branch: ni/coolstream
Commit: 624691ea0d
Author: vanhofen <vanhofen@gmx.de>
Date: 2016-12-15 (Thu, 15 Dec 2016)



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

configure.ac

@@ -253,48 +253,6 @@ AC_SUBST(BLURAY_LIBS)
 
 AC_OUTPUT([
 Makefile
-lib/Makefile
-lib/libconfigfile/Makefile
-lib/connection/Makefile
-lib/libeventserver/Makefile
-lib/libmd5sum/Makefile
-lib/libnet/Makefile
-lib/xmltree/Makefile
-lib/jsoncpp/Makefile
-lib/sectionsdclient/Makefile
-lib/timerdclient/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/web/jquery/Makefile
-src/nhttpd/web/info/Makefile
-src/nhttpd/tuxboxapi/Makefile
-src/nhttpd/yhttpd_core/Makefile
-src/nhttpd/yhttpd_mods/Makefile
-src/nhttpd/nhttpd.conf
-src/Makefile
-src/daemonc/Makefile
-src/driver/pictureviewer/Makefile
-src/driver/audiodec/Makefile
-src/driver/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/system/Makefile
-src/system/mtdutils/Makefile
-src/system/mtdutils/lib/Makefile
 data/Makefile
 data/fonts/Makefile
 data/icons/Makefile
@@ -318,8 +276,8 @@ data/inetradio/Makefile
 data/initial/Makefile
 data/iso-codes/Makefile
 data/lcd/Makefile
-data/lcd/icons/Makefile
 data/lcd/clock/Makefile
+data/lcd/icons/Makefile
 data/license/Makefile
 data/locale/Makefile
 data/neutrino-scripts/Makefile
@@ -328,10 +286,52 @@ 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/info/Makefile
+data/y-web/jquery/Makefile
+data/y-web/languages/Makefile
+data/y-web/scripts/Makefile
+data/y-web/styles/Makefile
+lib/Makefile
+lib/connection/Makefile
+lib/jsoncpp/Makefile
+lib/libconfigfile/Makefile
+lib/libdvbsub/Makefile
+lib/libeventserver/Makefile
+lib/libiw/Makefile
+lib/libmd5sum/Makefile
+lib/libnet/Makefile
+lib/libtuxtxt/Makefile
+lib/libupnpclient/Makefile
+lib/luaclient/Makefile
+lib/sectionsdclient/Makefile
+lib/timerdclient/Makefile
+lib/xmltree/Makefile
+src/Makefile
+src/daemonc/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
 src/timerd/Makefile
 src/zapit/Makefile
+src/zapit/data/Makefile
 src/zapit/lib/Makefile
 src/zapit/src/Makefile
-src/zapit/data/Makefile
 ])