Changeset 27517 for branches/eam_branches/20100225/ippMonitor/def/magicFailedMasks.d

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippMonitor/def/magicFailedMasks.d (modified) (1 diff)

branches/eam_branches/20100225/ippMonitor/def/magicFailedMasks.d

@@ -12 +12 @@
 FIELD    magicRun.diff_id,       5,   %d,     Diff ID
 FIELD    magicRun.label,         5,   %s,     Label
-FIELD    magicRun.inverse,       5,   %s,     Inverse
+FIELD    magicRun.inverse,       5,   %d,     Inverse
 FIELD    magicRun.state,         5,   %s,     State
 FIELD    magicMask.streaks,      5,   %d,     Fault
-FIELD    magicMask.fault,        5,   %s,     Fault
+FIELD    magicMask.fault,        5,   %d,     Fault