johan e58f84d5c8 Merge branch 'master' into merge_v4l2 ...

Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f

2014-02-23 21:53:13 +01: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

Moved effect configurations from the config file to effect directory

2013-12-11 21:58:59 +01:00

grabber

Merge branch 'master' into merge_v4l2

2014-02-23 21:53:13 +01:00

hyperion

Moved black border detection code to seperate library

2014-01-26 14:23:08 +01:00

jsonserver

Removed use of qt4_use_modules from build files

2014-02-07 09:20:00 +01:00

leddevice

Added additional zeroes after LPD6803 device message

2014-02-21 22:35:13 +01:00

protoserver

Removed use of qt4_use_modules from build files

2014-02-07 09:20:00 +01:00

utils

Merge branch 'master' into add_effect_engine

2013-12-05 21:01:52 +00:00

xbmcvideochecker

fixed some XBMC checker reconnection

2013-12-21 17:20:51 +01:00

CMakeLists.txt

Move V4L2 grabber code to separate library

2014-02-07 21:11:50 +01:00