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

Former-commit-id: 99c5d885d2ee876b33143e945a9280a652a6a2ff
2013-12-05 22:09:58 +01:00
..
2013-11-22 10:47:05 +00:00