Changeset 6873 for trunk/psModules/src/detrend

Timestamp:

Apr 17, 2006, 8:10:08 AM (20 years ago)

Author:

magnier

Message:

fixed up conflicts

Location:

trunk/psModules/src/detrend

Files:

• pmFlatField.c (modified) (1 diff)
• pmMaskBadPixels.c (modified) (1 diff)
• pmMaskBadPixelsErrors.h (modified) (1 diff)
• pmNonLinear.c (modified) (1 diff)

trunk/psModules/src/detrend/pmFlatField.c

@@ -24 +24 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 18:10:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psModules/src/detrend/pmMaskBadPixels.c

@@ -24 +24 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 18:10:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psModules/src/detrend/pmMaskBadPixelsErrors.h

@@ -12 +12 @@
  *  @author Ross Harman, MHPCC
  *
- *  @version $Revision: 1.2 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 18:10:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii

trunk/psModules/src/detrend/pmNonLinear.c

@@ -10 +10 @@
  *  @author GLG, MHPCC
  *
- *  @version $Revision: 1.6 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2006-04-17 18:01:05 $
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2006-04-17 18:10:08 $
  *
  *  Copyright 2004 Maui High Performance Computing Center, University of Hawaii