Merge branch 'master' into merge_v4l2

Former-commit-id: 97b281cc14b3bc239fc5eab1f66c9d15e67f753f
This commit is contained in:
johan
2014-02-23 21:36:39 +01:00
10 changed files with 75 additions and 20 deletions

View File

@@ -7,6 +7,7 @@ SET(V4L2_QT_HEADERS
)
SET(V4L2_HEADERS
${CURRENT_HEADER_DIR}/VideoStandard.h
)
SET(V4L2_SOURCES