b1rdhous3 dae32f72bf Merge remote-tracking branch 'refs/remotes/hyperion-project/master' into editor ... # Conflicts: # assets/webconfig/index.html		2016-08-30 23:50:26 +02:00
..
blackborder	fix doxy	2016-07-15 10:28:12 +02:00
boblightserver	enable components at runtime + grabber refactoring (#160)	2016-08-11 07:13:55 +02:00
bonjour	Travis osx support (#155)	2016-08-07 18:39:45 +02:00
commandline	Qcommandlineparser (#199)	2016-08-28 15:10:43 +02:00
effectengine	Clone single led color from other led (#157)	2016-08-08 00:17:00 +02:00
grabber	Fix "if" statement in XShmGetImage check and other things (#192)	2016-08-23 07:04:57 +02:00
hyperion	New JSON Editor	2016-08-30 23:49:21 +02:00
jsonserver	fix jsonrpc (1/2)	2016-08-25 13:52:31 +02:00
kodivideochecker	Kodi initial fix (#171)	2016-08-13 10:05:11 +02:00
leddevice	Web: Centralize websocket, add json port changer and led schemas (#209)	2016-08-30 23:25:27 +02:00
protoserver	Qcommandlineparser (#199)	2016-08-28 15:10:43 +02:00
udplistener	enable components at runtime + grabber refactoring (#160)	2016-08-11 07:13:55 +02:00
utils	Fix "if" statement in XShmGetImage check and other things (#192)	2016-08-23 07:04:57 +02:00
webconfig	webserver fix (#181)	2016-08-16 17:12:47 +02:00
CMakeLists.txt	Qcommandlineparser (#199)	2016-08-28 15:10:43 +02:00