svenhoefer b12624d1fa Merge branch 'master' into pu/mp ...

Conflicts:
	src/gui/miscsettings_menu.cpp
	src/neutrino.cpp
	src/system/settings.h

2017-03-20 01:31:51 +01:00

..

tuxboxapi

Merge branch 'master' into pu/mp

2017-03-20 01:31:51 +01:00

yhttpd_core

set useful thread names for all spawned threads

2017-02-12 22:55:36 +01:00

yhttpd_mods

Merge remote-tracking branch 'tuxbox/master'

2017-02-11 11:18:45 +01:00

Makefile.am

- yWeb: move data from /src to /data

2016-12-15 14:00:45 +01:00

nhttpd.conf.in

- yweb: re-introduce 'WebsiteMain.hosted_directory'

2013-06-27 12:20:29 +02:00

yconfig.h

nhttp: re-enable threading; lock NeutrinoAPI calls

2016-02-13 11:48:02 +01:00

yhttpd.cpp

Merge remote-tracking branch 'uncool/cst-next'

2015-12-13 17:41:55 +01:00

yhttpd.h

…