Changeset 22419 for branches/cnb_branch_20090215/ppSub

Timestamp:

Feb 22, 2009, 10:26:32 PM (17 years ago)

Author:

beaumont

Message:

Added pmStackVisual file. Still learning ins and outs of svn

Location:

branches/cnb_branch_20090215/ppSub/src

Files:

• ppSub.h (modified) (1 diff)
• ppSubArguments.c (modified) (1 diff)
• ppSubCamera.c (modified) (1 diff)
• ppSubLoop.c (modified) (1 diff)
• ppSubMakePSF.c (modified) (1 diff)
• ppSubMatchPSFs.c (modified) (1 diff)
• ppSubReadout.c (modified) (1 diff)
• ppSubReadoutPhotometry.c (modified) (1 diff)
• ppSubReadoutSubtract.c (modified) (1 diff)
• ppSubReadoutUpdate.c (modified) (1 diff)
• ppSubSetMasks.c (modified) (1 diff)
• ppSubVarianceFactors.c (modified) (1 diff)
• ppSubVersion.c (modified) (1 diff)

branches/cnb_branch_20090215/ppSub/src/ppSub.h

@@ -6 +6 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.6.2.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.7 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubArguments.c

@@ -6 +6 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.58.2.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.59 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubCamera.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.33.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.34 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubLoop.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.23.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.24 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubMakePSF.c

@@ -6 +6 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubMatchPSFs.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubReadout.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.112.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.113 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubReadoutPhotometry.c

@@ -6 +6 @@
  *
  *  @author IfA
+<<<<<<< .working
  *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
  *  @date $Date: 2009-02-19 17:59:49 $
+=======
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
+>>>>>>> .merge-right.r22214
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubReadoutSubtract.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.4.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:49 $
+ *  @version $Revision: 1.5 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubReadoutUpdate.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubSetMasks.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.2.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.3 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubVarianceFactors.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3.4.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */

branches/cnb_branch_20090215/ppSub/src/ppSubVersion.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.3.2.1 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-19 17:59:50 $
+ *  @version $Revision: 1.4 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-18 00:31:20 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */