hyperion.ng/src/config-tool
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
..
ConfigTool Merge branch 'multi_colortransform' 2013-12-05 22:09:58 +01:00
.gitignore Created the config tool for defining hyperion json file 2013-09-24 11:25:51 +02:00