frodovdr/hyperion.ng
1
0
Fork 0
mirror of https://github.com/hyperion-project/hyperion.ng.git synced 2025-03-01 10:33:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
294 Commits 1 Branch 16 Tags
Commit Graph

2 Commits

Author SHA1 Message Date
T. van der Zwan
950519625f Updated the test config file to contain more extensive settings 
Former-commit-id: 3f110bfc1086fb58e094c2ef7184fddc0ca61a98
 2013-12-05 21:37:28 +00:00
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