T. van der Zwan f65f546c61 Merge branch 'multi_colortransform'
Conflicts:
	CMakeLists.txt
	config/hyperion.config.json

Former-commit-id: 43d42e4fed479f60333b35bc092f9a55cd2ad8e8
2013-12-05 15:58:53 +00:00
..
2013-11-08 22:18:10 +01:00
2013-09-06 19:26:58 +00:00