IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

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

fix minor conflicts with head

File:
1 edited

Legend:

Unmodified
Added
Removed

  • 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.