Changeset 21424 for trunk/ppSub/src/ppSubReadout.c

Timestamp:

Feb 9, 2009, 11:26:05 AM (17 years ago)

Author:

Paul Price

Message:

Merging cnb_branch_20090113. One major conflict (ppSubReadout, due to recent major reorg of this file) easily resolved. Compiles, but not tested.

File:

• trunk/ppSub/src/ppSubReadout.c (modified) (2 diffs)

trunk/ppSub/src/ppSubReadout.c

@@ -6 +6 @@
  *
  *  @author IfA
- *  @version $Revision: 1.111 $ $Name: not supported by cvs2svn $
- *  @date $Date: 2009-02-06 01:37:17 $
+ *  @version $Revision: 1.112 $ $Name: not supported by cvs2svn $
+ *  @date $Date: 2009-02-09 21:26:05 $
  *  Copyright 2009 Institute for Astronomy, University of Hawaii
  */
@@ -52 +52 @@
         return false;
     }
- 
+
     if (!ppSubReadoutPhotometry (config, stats, view)) {
         psError(PS_ERR_UNKNOWN, false, "Unable to subtract background.");