IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 15557


Ignore:
Timestamp:
Nov 9, 2007, 2:49:13 PM (19 years ago)
Author:
eugene
Message:

fix minor conflicts with head

Location:
branches/eam_branch_20071023/psModules/src
Files:
5 edited

Legend:

Unmodified
Added
Removed

  • branches/eam_branch_20071023/psModules/src/concepts/pmConceptsAverage.h

    r15516 r15557  
    44 * @author Paul Price, IfA
    55 *
    6  * @version $Revision: 1.9.10.2 $ $Name: not supported by cvs2svn $
    7  * @date $Date: 2007-11-08 22:59:04 $
     6 * @version $Revision: 1.9.10.3 $ $Name: not supported by cvs2svn $
     7 * @date $Date: 2007-11-10 00:49:13 $
    88 * Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    99 */

  • branches/eam_branch_20071023/psModules/src/config/pmConfig.h

    r15516 r15557  
    55 *  @author Eugene Magnier, IfA
    66 *
    7  *  @version $Revision: 1.31.2.2 $ $Name: not supported by cvs2svn $
    8  *  @date $Date: 2007-11-08 22:59:04 $
    9  *
     7 *  @version $Revision: 1.31.2.3 $ $Name: not supported by cvs2svn $
     8 *  @date $Date: 2007-11-10 00:49:13 $
    109 *  Copyright 2005-2006 Institute for Astronomy, University of Hawaii
    1110 */

  • branches/eam_branch_20071023/psModules/src/imcombine/pmStack.c

    r15516 r15557  
    88 *  @author GLG, MHPCC
    99 *
    10  *  @version $Revision: 1.13.8.2 $ $Name: not supported by cvs2svn $
    11  *  @date $Date: 2007-11-08 22:59:04 $
    12  *
     10 *  @version $Revision: 1.13.8.3 $ $Name: not supported by cvs2svn $
     11 *  @date $Date: 2007-11-10 00:49:13 $
    1312 *  Copyright 2004-2007 Institute for Astronomy, University of Hawaii
    1413 *

  • branches/eam_branch_20071023/psModules/src/imcombine/pmSubtraction.h

    r15516 r15557  
    66 * @author GLG, MHPCC
    77 *
    8  * @version $Revision: 1.19.2.1 $ $Name: not supported by cvs2svn $
    9  * @date $Date: 2007-11-08 22:59:04 $
    10  *
     8 * @version $Revision: 1.19.2.2 $ $Name: not supported by cvs2svn $
     9 * @date $Date: 2007-11-10 00:49:13 $
    1110 * Copyright 2004-207 Institute for Astronomy, University of Hawaii
    1211 */

  • branches/eam_branch_20071023/psModules/src/objects/pmTrend2D.c

    r15516 r15557  
    33 *  @author EAM, IfA
    44 *
    5  *  @version $Revision: 1.4.2.2 $ $Name: not supported by cvs2svn $
    6  *  @date $Date: 2007-11-08 22:59:04 $
    7  *
     5 *  @version $Revision: 1.4.2.3 $ $Name: not supported by cvs2svn $
     6 *  @date $Date: 2007-11-10 00:49:13 $
    87 *  Copyright 2004 Institute for Astronomy, University of Hawaii
    98 *
    109 */
    11 // XXXX: Ignore (2)
    12 
    13 // XXXX: ignore
    14 
    15 // XXXX: ignore
    1610
    1711#ifdef HAVE_CONFIG_H
Note: See TracChangeset for help on using the changeset viewer.