hyperion.ng/libsrc/jsonserver
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
..
schema Merge branch 'master' into add_effect_engine 2013-12-05 21:01:52 +00:00
CMakeLists.txt Changed hue in HsvTransform from uint_8 to uint16_t 2013-08-22 20:31:57 +02:00
JsonClientConnection.cpp Merge branch 'master' into add_effect_engine 2013-12-05 21:01:52 +00:00
JsonClientConnection.h Added skeleton for effect engine development 2013-11-24 16:10:48 +01:00
JsonSchemas.qrc Added skeleton for effect engine development 2013-11-24 16:10:48 +01:00
JsonServer.cpp Changed hue in HsvTransform from uint_8 to uint16_t 2013-08-22 20:31:57 +02:00