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

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

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

bootsequence

Changed bootsequence to use the effect engine exclusively

2013-12-01 16:35:45 +01:00

dispmanx-grabber

Changed default grabbing flags when no xbmc checker is present

2013-11-14 19:51:10 +01: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

Merge branch 'master' into add_effect_engine

2013-12-05 21:01:52 +00:00

protoserver

hidapi added as dependency library

2013-11-22 14:42:02 +01:00

utils

Merge branch 'master' into add_effect_engine

2013-12-05 21:01:52 +00:00

xbmcvideochecker

added extra console output to the xbmc checker

2013-10-20 11:01:14 +02:00

CMakeLists.txt

Added skeleton for effect engine development

2013-11-24 16:10:48 +01:00