frodovdr
/
hyperion.ng
mirror of https://github.com/hyperion-project/hyperion.ng.git
1
0
Fork 0
Code Issues Releases Wiki Activity
hyperion.ng/libsrc/utils/jsonschema
History
T. van der Zwan cd02263e25 Merge branch 'master' into add_effect_engine 
Conflicts:
	include/hyperion/Hyperion.h
	libsrc/hyperion/Hyperion.cpp
	libsrc/jsonserver/JsonClientConnection.cpp

Former-commit-id: 1df163d1880691ded2fc8b5902c6ad3501912c48
 		2013-12-05 22:11:38 +01:00
..
JsonSchemaChecker.cpp Merge branch 'master' into add_effect_engine 2013-12-05 22:11:38 +01:00