Merge branch 'master' into add_v4l

Former-commit-id: b3f1d532c6145ba80c161b18214de6efbc55ff7b
This commit is contained in:
johan
2014-01-11 13:00:51 +01:00
82 changed files with 2122 additions and 5280 deletions

View File

@@ -5,3 +5,6 @@
// Define to enable the v4l2 grabber
#cmakedefine ENABLE_V4L2
// Define to enable the spi-device
#cmakedefine ENABLE_SPIDEV