| 
							
							
								 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 |  | 
			
				
					| 
							
							
								 johan | 3bd1789c42 | Fix bug: Only 1 EffectEngine allowed; SetColors implemented for EffectEngine Former-commit-id: ae8141ebd530b7735ffa7818dc3c690913769070 | 2013-11-29 23:22:49 +01:00 |  | 
			
				
					| 
							
							
								 T. van der Zwan | 958feabf5b | Added double as possible type Former-commit-id: 0caa8d0cb81db4d6592db296cb1f775e91efce50 | 2013-11-22 10:47:05 +00:00 |  | 
			
				
					| 
							
							
								 T. van der Zwan | ddc7bdd331 | Fixed use of 'enum' as type is schema Former-commit-id: 017cfe70198b37a05b9a852b30d783e239bf604b | 2013-11-20 09:07:01 +00:00 |  | 
			
				
					| 
							
							
								 T. van der Zwan | ecdd7775c5 | Fixed doxygen warnings | 2013-09-09 20:35:28 +00:00 |  | 
			
				
					| 
							
							
								 T. van der Zwan | 10b5b80675 | First working version with some test executables | 2013-07-26 20:38:34 +00:00 |  |