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
..
BlackBorderDetector.h	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00
BlackBorderProcessor.h	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00
ColorTransform.h	Implemented the multi-color transform including in hyperion-remote	2013-11-22 10:48:10 +00:00
Hyperion.h	Merge branch 'master' into add_effect_engine	2013-12-05 21:01:52 +00:00
ImageProcessor.h	Led count info added to Effect script	2013-11-28 14:40:03 +01:00
ImageProcessorFactory.h	Added reading the enable flag for the border detector	2013-10-20 22:27:05 +02:00
ImageToLedsMap.h	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00
LedDevice.h	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00
LedString.h	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00
PriorityMuxer.h	Changed RgbImage to template based Image (with template for pixel type)	2013-11-11 09:00:37 +00:00