Changeset 30631 for branches/czw_branch/20101203/ppTranslate/src/ppMopsMerge.c

Timestamp:

Feb 14, 2011, 1:05:28 PM (15 years ago)

Author:

watersc1

Message:

Merge of trunk back into branch.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ppTranslate/src/ppMopsMerge.c (modified) (1 diff)

branches/czw_branch/20101203/ppTranslate/src/ppMopsMerge.c

@@ -165 +165 @@
     if (num == 0) {
         //All detections were NULL?!
-        psTrace("ppMops.merge", 3, "All %d detections were NULL\n", detections->n);
+        psTrace("ppMops.merge", 3, "All %ld detections were NULL\n", detections->n);
         return NULL;
     }