frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity
hyperion.ng/libsrc/utils
History
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
..
jsonschema Merge branch 'master' into add_effect_engine 2013-12-05 22:11:38 +01: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