Changeset 1780

Timestamp:

03/30/12 09:20:41 (15 months ago)

Author:

philmoz

Message:

Merged revision(s) 1777 from branches/release-1_0:

Location:

trunk

Files:

• . (modified) (1 prop)
• platform/ixus200_sd980/platform_camera.h (modified) (1 diff)

trunk/platform/ixus200_sd980/platform_camera.h

@@ -35 +35 @@
     #define CAM_BRACKETING                  1
     #undef  CAM_VIDEO_CONTROL
-    #undef  CAM_HAS_IRIS_DIAPHRAGM
     #define CAM_MULTIPART                   1
     #define CAM_HAS_JOGDIAL                 1