- Timestamp:
- Aug 30, 2013, 4:48:58 PM (13 years ago)
- Location:
- branches/eam_branches/ipp-20130711/ippTools/src
- Files:
-
- 2 edited
-
. (modified) (1 prop)
-
difftool.c (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
branches/eam_branches/ipp-20130711/ippTools/src
- Property svn:mergeinfo changed
/trunk/ippTools/src (added) merged: 35856,35888,35896-35897,35955,35960,36009,36019,36041,36046
- Property svn:mergeinfo changed
-
branches/eam_branches/ipp-20130711/ippTools/src/difftool.c
r35558 r36071 1253 1253 PXOPT_LOOKUP_STR(note, config->args, "-set_note", false, false); 1254 1254 PXOPT_LOOKUP_TIME(registered, config->args, "-set_registered", false, false); 1255 PXOPT_LOOKUP_STR(warp_data_group, config->args, "-data_group", false, false); 1255 1256 1256 1257 PXOPT_LOOKUP_BOOL(simple, config->args, "-simple", false); … … 1260 1261 1261 1262 1263 if (!data_group) { 1264 if (warp_data_group) { 1265 data_group = warp_data_group; 1266 } 1267 } 1268 1262 1269 // Get query file 1263 1270 psString query = pxDataGet("difftool_definewarpstack.sql");
Note:
See TracChangeset
for help on using the changeset viewer.
