Thulinma 355d55decc Merge branch 'development' into LTS_development ... # Conflicts: # src/controller/controller_api.cpp # src/controller/controller_api.h # src/controller/controller_statistics.cpp # src/controller/controller_statistics.h		2018-03-20 20:15:10 +01:00
..
analysers	Merge branch 'development' into LTS_development	2018-01-24 20:16:35 +01:00
controller	Merge branch 'development' into LTS_development	2018-03-20 20:15:10 +01:00
input	No longer print RTSP data to stderr on transport error	2018-03-01 16:37:43 +01:00
output	Added HTTP info.js websocket mode	2018-03-20 15:16:24 +01:00
utils	Improved logging system	2017-12-08 19:48:49 +01:00
embed.js	LSP/embed: fix for + in filenames in folder streams	2016-07-21 11:40:09 +02:00
icon.h	Converted HTTP based outputs to new and improved mechanism, increasing robustness and efficiency.	2014-10-31 00:38:25 +01:00
io.cpp	Merge branch 'development' into LTS_development	2018-01-24 19:12:05 +01:00
io.h	Merge branch 'development' into LTS_development	2018-01-24 19:12:05 +01:00
sourcery.cpp	Cross compiling is hell.	2017-03-13 14:18:45 +01:00
xap.h	Converted HTTP based outputs to new and improved mechanism, increasing robustness and efficiency.	2014-10-31 00:38:25 +01:00