Changeset 37432
- Timestamp:
- Sep 25, 2014, 11:46:19 AM (12 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20130712/psModules/src/concepts/pmConcepts.c
- Property svn:mergeinfo changed
/trunk/psModules/src/concepts/pmConcepts.c merged: 37419
r37383 r37432 313 313 conceptRegisterTime("FPA.TIME", "Time of exposure", false, PM_FPA_LEVEL_FPA); 314 314 315 conceptRegister Time("FPA.SHUTOUTC", "Time of exposure",false, PM_FPA_LEVEL_FPA);315 conceptRegisterStr("FPA.SHUTOUTC", "Time of exposure", NULL,NULL,NULL,false, PM_FPA_LEVEL_FPA); 316 316 317 317 conceptRegisterF32("FPA.TEMP", "Temperature of focal plane", NULL, NULL, NULL, false, PM_FPA_LEVEL_FPA); - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
