T. van der Zwan 59eb7f788e Merge branch 'master' into add_effect_engine ... Conflicts: include/hyperion/Hyperion.h libsrc/hyperion/Hyperion.cpp libsrc/jsonserver/JsonClientConnection.cpp Former-commit-id: 53467c63b97c7dc370f04357588f7cf1ad0e3ada		2013-12-05 21:01:52 +00:00
..
boblightserver	BoblightServer added	2013-11-08 22:18:10 +01:00
bootsequence	Added factory to boot-sequence	2013-08-25 16:20:19 +00:00
dispmanx-grabber	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00
effectengine	Changed bootsequence to use the effect engine exclusively	2013-12-01 16:35:45 +01:00
hyperion	Merge branch 'master' into add_effect_engine	2013-12-05 21:01:52 +00:00
jsonserver	Fixed doxygen warnings	2013-09-09 20:35:28 +00:00
protoserver	Added ProtoServer to the Hyperion server;	2013-10-13 14:48:59 +02:00
utils	Renamed ColorTransform to RgbChannelTransform	2013-11-19 20:17:59 +00:00
xbmcvideochecker	Changed XBMC Video checker from emitting all black on a lower channel than the grabber to commanding the grabber	2013-09-23 22:33:38 +02:00