redpanther eb64cc6601 Merge remote-tracking branch 'upstream/master/master' into prio_cleanup ... Conflicts: config/hyperion.config.json Former-commit-id: 7f6fd562b78a6c4b646d9f1587941265b2ca12e0		2016-03-09 07:09:20 +01:00
..
blackborder	Merge pull request #496 from wisc17/blackborder	2016-02-23 21:03:05 +01:00
boblightserver	make all prios settable and make prios more consistent	2016-03-08 17:31:56 +01:00
effectengine	Update CMakeLists.txt	2016-02-24 00:24:46 +01:00
grabber	create external framebuffer grabber	2016-03-09 07:03:17 +01:00
hyperion	Merge remote-tracking branch 'upstream/master' into proto_json_forwarder	2016-02-24 15:07:30 +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 pull request #514 from penfold42/master	2016-03-08 22:53:29 +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