hyperion.ng/libsrc/utils
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
..
jsonschema Merge branch 'master' into add_effect_engine 2013-12-05 21:01:52 +00:00
CMakeLists.txt Renamed ColorTransform to RgbChannelTransform 2013-11-19 20:17:59 +00:00
ColorArgb.cpp Changed RgbImage to template based Image (with template for pixel type) 2013-11-11 09:00:37 +00:00
ColorRgb.cpp Changed RgbImage to template based Image (with template for pixel type) 2013-11-11 09:00:37 +00:00
ColorRgba.cpp Changed RgbImage to template based Image (with template for pixel type) 2013-11-11 09:00:37 +00:00
HsvTransform.cpp Added ProtoServer to the Hyperion server; 2013-10-13 14:48:59 +02:00
RgbChannelTransform.cpp Renamed ColorTransform to RgbChannelTransform 2013-11-19 20:17:59 +00:00