hyperion.ng/config
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
..
hyperion_test.config.json Merge branch 'master' into add_effect_engine 2013-12-05 21:01:52 +00:00
hyperion_x86.config.json Updated x86 config file with more color transforms 2013-11-22 10:46:40 +00:00
hyperion.config.json Added multi transforms for testing purpose 2013-11-22 13:51:39 +00:00