redpanther c7df8c23c6 Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id ... Conflicts: src/hyperion-aml/CMakeLists.txt src/hyperion-remote/CMakeLists.txt src/hyperion-v4l2/CMakeLists.txt Former-commit-id: d34fbdd65e7c95bafe43396e1ccef7ad30def7fb		2016-03-13 08:04:49 +01:00
..
CMakeLists.txt	Merge remote-tracking branch 'upstream/master/master' into hyperion_version_id	2016-03-13 08:04:49 +01:00
ColorTransformValues.h	Fixed doxygen warnings	2013-09-09 20:35:28 +00:00
CustomParameter.h	Missing include added	2014-02-07 15:28:14 +01:00
hyperion-remote.cpp	print version for every standalone grabber and hyperiond	2016-03-10 12:01:10 +01:00
JsonConnection.cpp	Hyperion-remote changed to support multiple colors in the setColor command	2013-12-13 00:01:48 +01:00
JsonConnection.h	Hyperion-remote changed to support multiple colors in the setColor command	2013-12-13 00:01:48 +01:00