diff options
| author | Mihael Koep <koep@schneide.com> | 2012-10-19 17:03:49 +0200 |
|---|---|---|
| committer | Mihael Koep <koep@schneide.com> | 2012-10-19 17:03:49 +0200 |
| commit | 9866002f3f569f6da886d71964d3298183cd1646 (patch) | |
| tree | 968097e2f5fa11a094238ead6469739a725d8ce2 /plugins/dexela/uca-dexela-camera.h | |
| parent | 37f48ae1b67b1205ba4884ec350afdf5ab7dd2d3 (diff) | |
| parent | 6f12303cf4c4130d544c30f8ad5e2445a1fa3e61 (diff) | |
| download | uca-9866002f3f569f6da886d71964d3298183cd1646.tar.gz uca-9866002f3f569f6da886d71964d3298183cd1646.tar.bz2 uca-9866002f3f569f6da886d71964d3298183cd1646.tar.xz uca-9866002f3f569f6da886d71964d3298183cd1646.zip | |
Merge remote branch 'origin/master' into dexela
Conflicts:
CMakeLists.txt
src/CMakeLists.txt
src/uca-camera.c
Diffstat (limited to 'plugins/dexela/uca-dexela-camera.h')
0 files changed, 0 insertions, 0 deletions