T. van der Zwan
|
59eb7f788e
|
Merge branch 'master' into add_effect_engine
Conflicts:
include/hyperion/Hyperion.h
libsrc/hyperion/Hyperion.cpp
libsrc/jsonserver/JsonClientConnection.cpp
Former-commit-id: 53467c63b97c7dc370f04357588f7cf1ad0e3ada
|
2013-12-05 21:01:52 +00:00 |