hyperion.ng/libsrc/jsonserver
T. van der Zwan cd02263e25 Merge branch 'master' into add_effect_engine
Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48
2013-12-05 22:11:38 +01:00
..
schema Merge branch 'master' into add_effect_engine 2013-12-05 22:11:38 +01:00
CMakeLists.txt Changed hue in HsvTransform from uint_8 to uint16_t 2013-08-22 20:31:57 +02:00
JsonClientConnection.cpp Added the possibility to set effect arguments over json 2013-12-01 14:09:01 +01: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