Changeset 34466 for branches/eam_branches/ipp-20120905/ippTools/src
- Timestamp:
- Sep 25, 2012, 10:05:21 AM (14 years ago)
- Location:
- branches/eam_branches/ipp-20120905/ippTools/src
- Files:
-
- 3 edited
-
. (modified) (1 prop)
-
difftoolConfig.c (modified) (1 diff)
-
magictool.c (modified) (1 prop)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20120905/ippTools/src
- Property svn:mergeinfo changed
/trunk/ippTools/src merged: 34429,34443
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20120905/ippTools/src/difftoolConfig.c
r32485 r34466 351 351 psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-rerun", 0, "define new run even if one exists", false); 352 352 psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-available", 0, "define new run even if no stacks available for some skycells", false); 353 psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template ", false);353 psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-new-templates", 0, "also search for diffs with new template and same template label", false); 354 354 psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); 355 355 psMetadataAddBool(definestackstackArgs, PS_LIST_TAIL, "-pretend", 0, "list results but do not queue", false); -
branches/eam_branches/ipp-20120905/ippTools/src/magictool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/magictool.c merged: 34429
- Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
