T. van der Zwan d56027da20 Merge branch 'add_effect_engine' ...

Conflicts:
	config/hyperion.config.json
	libsrc/bootsequence/KittBootSequence.h

Former-commit-id: ca9492accdf2ffdad52f6c0695cbba955f802b97

2013-12-14 01:47:38 +00:00

..

hyperion_test.config.json

Updated the test config file to contain more extensive settings

2013-12-05 21:37:28 +00:00

hyperion_x86.config.json

Updated x86 config file with more color transforms

2013-11-22 10:46:40 +00:00

hyperion.config.json

Merge branch 'add_effect_engine'

2013-12-14 01:47:38 +00:00