T. van der Zwan d56027da20 Merge branch 'add_effect_engine' ...

Conflicts:
	config/hyperion.config.json
	libsrc/bootsequence/KittBootSequence.h

Former-commit-id: ca9492accdf2ffdad52f6c0695cbba955f802b97

2013-12-14 01:47:38 +00:00

..

boblightserver

BoblightServer added

2013-11-08 22:18:10 +01:00

dispmanx-grabber

Changed RgbImage to template based Image (with template for pixel type)

2013-11-11 09:00:37 +00:00

effectengine

Removed runEffectScript from Hyperion class

2013-12-13 22:41:24 +01:00

hyperion

Merge branch 'add_effect_engine'

2013-12-14 01:47:38 +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