Changeset 1721 for branches/release-1_0/include/conf.h

Timestamp:

03/11/12 07:20:03 (15 months ago)

Author:

philmoz

Message:

Minor changes:

• merge CHDK-DE revision 967 into CHDK
• add SD30 1.00f as a copy of 1.00g (​http://chdk.setepontos.com/index.php?topic=2724.msg81879#msg81879)
• add SX230 1.01e as a copy of 1.01b (​http://chdk.setepontos.com/index.php?topic=6397.msg81391#msg81391)
• fix default script so that english is the default language for CHDK (was set to german after merging CHDK-DE code)

File:

• branches/release-1_0/include/conf.h (modified) (1 diff)

branches/release-1_0/include/conf.h

@@ -314 +314 @@
     int touchscreen_disable_shortcut_controls;
 
-        // Enable USB icon
-    int usb_info_enable; 
-    int ext_video_time;
+    // Enable USB icon
+    int usb_info_enable;
+    int ext_video_time;     // save gps_track_time
 #ifdef CAM_HAS_GPS
     int gps_record;