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	Merge pull request #496 from wisc17/blackborder	2016-02-23 21:03:05 +01:00
boblightserver	Merge pull request #445 from frostworx/master	2016-01-13 22:43:15 +01:00
effectengine	Update CMakeLists.txt	2016-02-24 00:24:46 +01:00
grabber	Merge remote-tracking branch 'refs/remotes/tvdzwan/master'	2016-03-09 19:25:04 +01:00
hyperion	Merge remote-tracking branch 'refs/remotes/tvdzwan/master'	2016-03-09 19:25:04 +01:00
jsonserver	basic loop connection detection. prevent if you configure forward to 127.0.0.1:<port> and your server has the same port.	2016-02-18 10:32:38 +01:00
leddevice	Merge remote-tracking branch 'refs/remotes/tvdzwan/master'	2016-03-09 19:25:04 +01:00
protoserver	make protoconnection to invalid host less blocking	2016-02-25 15:21:25 +01:00
utils	Finished the amlogic grabber for the 'WeTek Play'	2015-08-20 09:51:44 +02:00
xbmcvideochecker	added optional QT5 support - LedDevicePhilipsHue needs proper fixes	2016-01-06 17:31:23 +01:00
CMakeLists.txt	Allow disabling PROTOBUF support	2014-09-08 16:16:02 +02:00