diff options
| author | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-10 10:56:54 +0200 |
|---|---|---|
| committer | Matthias Vogelgesang <matthias.vogelgesang@gmail.com> | 2012-08-10 10:56:54 +0200 |
| commit | 1ae9dcd4ae312d497f8aa2381efee1b49b727a90 (patch) | |
| tree | 685693acdb44cc51424b7b25877cd6a2d0d82fe6 /src/config.h.in | |
| parent | bf30a848ad7ac00218aab6589df7a19d868728cd (diff) | |
| parent | 859a6a6802e1891628af988a83a3e24b5b75c007 (diff) | |
| download | uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.gz uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.bz2 uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.tar.xz uca-1ae9dcd4ae312d497f8aa2381efee1b49b727a90.zip | |
Merge branch 'ipe-basler'
Conflicts:
src/CMakeLists.txt
Diffstat (limited to 'src/config.h.in')
| -rw-r--r-- | src/config.h.in | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/config.h.in b/src/config.h.in index 0b1dde9..e3911a1 100644 --- a/src/config.h.in +++ b/src/config.h.in @@ -2,6 +2,7 @@ #cmakedefine HAVE_PHOTON_FOCUS #cmakedefine HAVE_PHOTRON_FASTCAM #cmakedefine HAVE_UFO_CAMERA +#cmakedefine HAVE_PYLON_CAMERA #cmakedefine HAVE_MOCK_CAMERA #define CONTROL_GLADE_PATH "${CMAKE_INSTALL_PREFIX}/share/libuca/control.glade" |