Changeset 33338
- Timestamp:
- Feb 22, 2012, 11:04:37 AM (14 years ago)
- Location:
- tags/ipp-20111222/ippTools/src
- Files:
-
- 2 edited
-
pstamptool.c (modified) (1 diff, 1 prop)
-
pstamptoolConfig.c (modified) (1 diff, 1 prop)
Legend:
- Unmodified
- Added
- Removed
-
tags/ipp-20111222/ippTools/src/pstamptool.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/pstamptool.c merged: 33337
r33120 r33338 780 780 PXOPT_COPY_S64(config->args, where, "-req_id", "req_id", "=="); 781 781 PXOPT_COPY_S64(config->args, where, "-dep_id", "dep_id", "=="); 782 PXOPT_COPY_STR(config->args, where, "-jobType", "jobType", "=="); 782 783 PXOPT_COPY_S64(config->args, where, "-fault", "fault", "=="); 783 784 - Property svn:mergeinfo changed
-
tags/ipp-20111222/ippTools/src/pstamptoolConfig.c
- Property svn:mergeinfo changed
/trunk/ippTools/src/pstamptoolConfig.c merged: 33337
r33120 r33338 154 154 psMetadataAddS64(listjobArgs, PS_LIST_TAIL, "-dep_id", 0, "select by dependent ID", 0); 155 155 psMetadataAddS16(listjobArgs, PS_LIST_TAIL, "-fault", 0, "select by fault", 0); 156 psMetadataAddStr(listjobArgs, PS_LIST_TAIL, "-jobType", 0, "select by jobType", 0); 156 157 psMetadataAddU64(listjobArgs, PS_LIST_TAIL, "-limit", 0, "limit result set to N items", 0); 157 158 psMetadataAddBool(listjobArgs, PS_LIST_TAIL, "-simple", 0, "use the simple output format", false); - Property svn:mergeinfo changed
Note:
See TracChangeset
for help on using the changeset viewer.
