Context Navigation

stacktool.c

Timestamp:

Nov 27, 2019, 11:39:38 AM (7 years ago)

Author:

eugene

Message:

merge changes from trunk (mostly Ohana & ippMonitor improvements, some work on ippTools)

Location:

branches/eam_branches/ipp-20191011

Files:

Property svn:mergeinfo changed

/branches/IPP-308_move_backups_folder (added)	merged: 40969-40970
/branches/ipp-259_genericise_backups (added)	merged: 40910-40913,40915,40919-40924,40931-40932,40937,40944-40945,40949-40952,40958-40959,40962-40963,40966
/trunk (added)	merged: 40936,40967,40971-40973,41067,41071-41072,41125-41129,41132-41135,41145,41151-41166

Property svn:mergeinfo set to (toggle deleted branches)

/branches/IPP-308_move_backups_folder/ippTools/src	merged	eligible
/branches/ccl_branches/ipp-20190806/ippTools/src	merged	eligible
/branches/czw_branch/20160809/ippTools/src	merged	eligible
/branches/czw_branch/20170908/ippTools/src	merged	eligible
/trunk/ippTools/src	merged	eligible
/branches/ipp-259_genericise_backups/ippTools/src	40910-40966

r39926	r41170
1211	1211	PXOPT_COPY_S64(config->args, where, "-stack_id", "stackSumSkyfile.stack_id", "==");
1212	1212	PXOPT_COPY_STR(config->args, where, "-tess_id", "stackRun.tess_id", "LIKE");
1213		PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "==");
	1213	PXOPT_COPY_STR(config->args, where, "-skycell_id", "stackRun.skycell_id", "LIKE");
1214	1214	PXOPT_COPY_STR(config->args, where, "-filter", "stackRun.filter", "LIKE");
1215	1215	PXOPT_COPY_STR(config->args, where, "-state", "stackRun.state", "==");

Note: See TracChangeset for help on using the changeset viewer.