IPP Software

Navigation

Tools

IPP Links

Communication

Pan-STARRS Links

Context Navigation

← Previous Change
Next Change →

Changeset 36375 for trunk/psModules/src/camera/pmFPAfile.h

Timestamp:

Dec 10, 2013, 2:55:11 PM (12 years ago)

Author:

eugene

Message:

merge changes from eam_branches/ipp-20130904

Location:

Files:

: 3 edited

. (modified) (1 prop)
psModules (modified) (1 prop)
psModules/src/camera/pmFPAfile.h (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

trunk

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20130904 (added)

merged: 36095,36144-36146,36148-36158,36160-36164,36192-36199,36204-36220,36226-36230,36233-36236,36239-36247,36251-36264,36266-36286,36291-36294,36297-36311,36314-36336,36338-36355,36358,36362,36367-36371

trunk/psModules

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20130904/psModules (added)

merged: 36152,36154,36157-36158,36162,36196,36204-36209,36215,36217,36226,36228-36229,36233,36235,36239-36240,36243-36246,36257,36259,36261,36264,36266,36268-36270,36276-36277,36281,36283,36294,36297-36300,36307,36309,36311,36314,36320,36324,36326,36329,36334,36344,36351,36354,36362,36369

trunk/psModules/src/camera/pmFPAfile.h

r33913	r36375
34	34	PM_FPA_FILE_CMP,
35	35	PM_FPA_FILE_CMF,
	36	PM_FPA_FILE_CFF,
36	37	PM_FPA_FILE_WCS,
37	38	PM_FPA_FILE_RAW,

Note: See TracChangeset for help on using the changeset viewer.

Download in other formats: