IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Ignore:
Timestamp:
Feb 5, 2009, 4:31:25 PM (17 years ago)
Author:
Paul Price
Message:

Merging pap_branch_20090128. Resolved a small number of conflicts. Compiles, but not tested in detail.

File:
1 edited

Legend:

Unmodified
Added
Removed

  • trunk/psModules/src/camera/pmFPAfile.h

    r21279 r21363  
    44 * @author EAM, IfA
    55 *
    6  * @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2009-02-04 02:39:36 $
     6 * @version $Revision: 1.35 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2009-02-06 02:31:24 $
     8 *
    89 * Copyright 2004-2005 Institute for Astronomy, University of Hawaii
    910 */
    … …  
    3738    PM_FPA_FILE_IMAGE,
    3839    PM_FPA_FILE_MASK,
    39     PM_FPA_FILE_WEIGHT,
     40    PM_FPA_FILE_VARIANCE,
    4041    PM_FPA_FILE_FRINGE,
    4142    PM_FPA_FILE_DARK,
Note: See TracChangeset for help on using the changeset viewer.