AEtHeLsYn 9db45c0ffb Merge remote-tracking branch 'refs/remotes/tvdzwan/master' ... # Conflicts: # include/hyperion/Hyperion.h # libsrc/hyperion/CMakeLists.txt # libsrc/hyperion/Hyperion.cpp Former-commit-id: 1144520581d4531952038d2118cb11e01bebc10e		2016-03-09 19:25:04 +01:00
..
blackborder	added bottom right to osd mode	2016-02-11 15:50:51 +01:00
boblightserver	BoblightServer added	2013-11-08 22:18:10 +01:00
effectengine	Add support for Python 3	2014-02-26 18:10:17 +01:00
grabber	prepare standalone amlogic grabber	2016-02-24 14:42:25 +01:00
hyperion	Merge remote-tracking branch 'refs/remotes/tvdzwan/master'	2016-03-09 19:25:04 +01:00
jsonserver	Fixed doxygen warnings	2013-09-09 20:35:28 +00:00
leddevice	Moved all devices to separate library and added 'Factory' for device creation.	2013-12-17 18:50:15 +00:00
protoserver	make protoconnection to invalid host less blocking	2016-02-25 15:21:25 +01:00
utils	Merge remote-tracking branch 'refs/remotes/tvdzwan/master'	2016-03-09 19:25:04 +01:00
xbmcvideochecker	Cleanup of XBMC 3D checker code	2014-04-30 22:46:26 +02:00