Changeset 33415 for branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionStamps.h

Timestamp:

Mar 5, 2012, 5:19:48 PM (14 years ago)

Author:

mhuber

Message:

merging latest r33407 trunk changes to meh_branches/ppstack_test

Location:

branches/meh_branches/ppstack_test

Files:

• . (modified) (1 prop)
• psModules (modified) (1 prop)
• psModules/src/imcombine/pmSubtractionStamps.h (modified) (1 diff)

branches/meh_branches/ppstack_test/psModules/src/imcombine/pmSubtractionStamps.h

@@ -163 +163 @@
                              float x, float y, ///< Position of stamp
                              float size,///< Size of circle
-                             const char *color ///< Colour
+                             const char *color, ///< Colour
+                             const char *ds9text ///< info text
     );
-
+// MEH added text to ds9 file
 
 bool pmSubtractionStampsResetStatus (pmSubtractionStampList *stamps);