Changeset 1737 for branches/reyalp-ptp-live/include/modelist.h
- Timestamp:
- 03/16/12 04:51:39 (15 months ago)
- Location:
- branches/reyalp-ptp-live
- Files:
-
- 2 modified
-
. (modified) (1 prop)
-
include/modelist.h (modified) (1 diff)
Legend:
- Unmodified
- Added
- Removed
-
branches/reyalp-ptp-live
- Property svn:mergeinfo changed
/branches/release-1_0 merged: 1721,1730,1732 /trunk merged: 1722-1724,1727,1731,1733,1736
- Property svn:mergeinfo changed
-
branches/reyalp-ptp-live/include/modelist.h
r1663 r1737 126 126 MODE_FIREWORK , // ixus1000 end 127 127 MODE_LIVE , // A3300is 128 MODE_DISCREET , // A3300is 128 MODE_DISCREET , // A3300is 129 MODE_BLUR_REDUCTION , // a800 129 130 }; 130 131