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

Conflicts:
	src/gui/update_settings.cpp


Origin commit data
------------------
Commit: aeebd0d444
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-09-14 (Thu, 14 Sep 2017)
This commit is contained in:
vanhofen
2017-09-14 16:30:58 +02:00
22 changed files with 50104 additions and 76 deletions

View File

@@ -27,7 +27,7 @@
//-----------------------------------------------------------------------------
// General central Definitions <configure!>
//-----------------------------------------------------------------------------
#define HTTPD_VERSION "3.4.0" // Webserver version (can be overloaded)
#define HTTPD_VERSION "3.4.1" // Webserver version (can be overloaded)
#define YHTTPD_VERSION "1.3.2" // Webserver version (Version of yhttpd-core!)
#define IADDR_LOCAL "127.0.0.1" // local IP
#define HTTPD_NAME "yhttpd" // Webserver name (can be overloaded)