ntim 507a237f47 Merge branch 'master' into support_for_philips_hue ... Conflicts: libsrc/leddevice/LedDevicePhilipsHue.cpp libsrc/leddevice/LedDevicePhilipsHue.h Former-commit-id: 5f0b05cce12ca5c42ac2cdd94b9418d6eaef0f57		2014-08-18 17:08:21 +02:00
..
blackborder	Moved black border detection code to seperate library	2014-01-26 14:23:08 +01:00
boblightserver	Removed use of qt4_use_modules from build files	2014-02-07 09:20:00 +01:00
effectengine	Disable the blackborder detector for effects	2014-04-30 22:53:05 +02:00
grabber	V4L2: Fix error with byte order of RGB32	2014-04-15 20:44:16 +02:00
hyperion	Fix integration area = 0 for a led	2014-05-06 22:02:40 +02:00
jsonserver	Fix schema requirement for json transforms (use numbers instead of doubles to allow integer values for zero and one)	2014-08-01 10:13:40 +02:00
leddevice	Merge branch 'master' into support_for_philips_hue	2014-08-18 17:08:21 +02:00
protoserver	Removed use of qt4_use_modules from build files	2014-02-07 09:20:00 +01:00
utils	Added a possible delay after connecting an Adalight device	2014-05-04 11:31:13 +02:00
xbmcvideochecker	Cleanup of XBMC 3D checker code	2014-04-30 22:46:26 +02:00
CMakeLists.txt	Move V4L2 grabber code to separate library	2014-02-07 21:11:50 +01:00