- Timestamp:
- Jun 15, 2011, 5:25:23 AM (15 years ago)
- Location:
- branches/eam_branches/ipp-20110505
- Files:
-
- 3 edited
-
. (modified) (1 prop)
-
ippTools/src (modified) (1 prop)
-
ippTools/src/magictool.c (modified) (2 diffs, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20110505
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20110505/ippTools/src
- Property svn:mergeinfo changed
/trunk/ippTools/src (added) merged: 31477-31478,31482,31497,31517,31528-31529,31564,31596,31605
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20110505/ippTools/src/magictool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/magictool.c (added) merged: 31605
r31445 r31628 404 404 PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); 405 405 PXOPT_LOOKUP_BOOL(clearfault, config->args, "-clearfault", false); 406 406 PXOPT_LOOKUP_STR(label, config->args, "-set_label", false, false); 407 407 408 psString setString = NULL; 408 409 if (fault || clearfault) { … … 411 412 if (note) { 412 413 psStringAppend(&setString, ", note = '%s'", note); 414 } 415 if (label) { 416 psStringAppend(&setString, ", label = '%s'", label); 413 417 } 414 418 - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
