Context Navigation

← Previous Change
Next Change →

regtoolConfig.c

Timestamp:

Jul 17, 2014, 12:36:19 PM (12 years ago)

Author:

eugene

Message:

merge changes (from past YEAR) from trunk

Location:

branches/eam_branches/ipp-ops-20130712

Files:

: 4 edited

. (modified) (1 prop)
ippTools (modified) (1 prop)
ippTools/src (modified) (2 props)
ippTools/src/regtoolConfig.c (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

branches/eam_branches/ipp-ops-20130712

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20140423 (added)	merged: 36693-36694,36737-36741,36745-36746,36748-36750,36764-36770,36790-36798,36800,36803-36809,36813-36814,36816-36820,36823-36832
/branches/eam_branches/ipp-20140610 (added)	merged: 36845,36884-36885,36898-36912,36916-36923,36925,36928,36932-36947,36974-36980,36982-36999,37001-37012,37014,37017-37029
/trunk (added)	merged: 35817-35818,35820-35821,35826-35831,35833,35836-35839,35841,35846,35848-35850,35852-35854,35856,35864-35865,35867-35868,35881,35884,35887-35888,35892-35897,35899-35904,35906,35911,35916-35917,35924-35925,35927-35929,35931-35932,35936-35939,35945,35950-35953,35955-35958,35960,35964,35975-35977,35979-36011,36017-36019,36035-36037,36040-36048,36051,36057-36061,36076-36089,36094,36096-36108,36111,36114-36121,36123-36124,36126,36128,36130-36133,36135,36137,36142-36143,36147,36159,36165-36170,36173-36178,36180,36182-36183,36185-36191,36200-36203,36221-36223,36225,36231-36232,36237-36238,36248-36250,36287,36289-36290,36295-36296,36312-36313,36337,36356-36357,36360-36361,36363-36366,36372-36375,36384,36397,36403-36404,36413,36421,36428-36431,36434-36435,36441,36447,36452-36457,36459,36463,36476-36478,36481-36493,36495,36497-36498,36500-36501,36507-36512,36515,36528-36529,36537,36541-36544,36552-36553,36555-36556,36572,36579-36583,36594-36596,36603,36605,36610,36614-36615,36623,36630-36635,36638-36640,36642-36643,36645,36647,36649-36651,36653,36655,36657-36666,36668-36671,36679,36681,36683-36685,36687-36688,36691,36695,36697-36702,36704,36706-36732,36734-36736,36744,36747,36752-36763,36771-36773,36779,36781,36784-36789,36799,36801-36802,36810-36812,36815,36821,36833-36841,36844,36846-36871,36874,36879,36882,36886,36888,36890,36892,36894,36896-36897,36913-36914,36924,36948,36950-36951,36953,36955,36957,36959,36961,36963,36966,36968,36970,36972,36981,37000,37013,37015-37016,37030-37056
/branches/czw_branch/20101203	removed
/branches/czw_branch/20120906	removed
/branches/eam_branches/ipp-20101103	removed
/branches/eam_branches/ipp-20101205	removed
/branches/eam_branches/ipp-20110213	removed
/branches/eam_branches/ipp-20110404	removed
/branches/eam_branches/ipp-20110505	removed
/branches/eam_branches/ipp-20110710	removed
/branches/eam_branches/ipp-20110906	removed
/branches/eam_branches/ipp-20111110	removed
/branches/eam_branches/ipp-20120405	removed
/branches/eam_branches/ipp-20120601	removed
/branches/eam_branches/ipp-20120627	removed
/branches/eam_branches/ipp-20120805	removed
/branches/eam_branches/ipp-20120905	removed
/branches/eam_branches/ipp-20121130	removed
/branches/eam_branches/ipp-20121219	removed
/branches/eam_branches/ipp-20130207	removed
/branches/eam_branches/ipp-20130307	removed
/branches/eam_branches/ipp-20130419	removed
/branches/eam_branches/ipp-20130509	removed
/branches/haf_add201112	removed

branches/eam_branches/ipp-ops-20130712/ippTools

Property svn:mergeinfo changed

/trunk/ippTools

merged: 36077,36137,36167,36170,36248-36249,36361,36374,36384,36431,36441,36455,36493,36507,36511-36512,36515,36529,36543-36544,36555-36556,36572,36623,36633,36661,36665,36668,36853,36896-36897,36914,36963,36968,36981,37016,37054

branches/eam_branches/ipp-ops-20130712/ippTools/src

Property svn:ignore

old	new
47	47	sctool
48	48	releasetool
	49	fftool
	50	remotetool
	51

Property svn:mergeinfo deleted

branches/eam_branches/ipp-ops-20130712/ippTools/src/regtoolConfig.c

r32593	r37068
292	292	psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-state", 0, "search by exposure state", NULL);
293	293	psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_tag", 0, "search by exp_tag", NULL);
294		psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", ~~"object"~~);
	294	psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-exp_type", 0, "search by exp_type", NULL);
295	295	psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-filelevel", 0, "search by filelevel", NULL);
296	296	psMetadataAddStr(processedexpArgs, PS_LIST_TAIL, "-reduction", 0, "search by reduction class", NULL);

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

Context Navigation

Changeset 37068 for branches/eam_branches/ipp-ops-20130712/ippTools/src/regtoolConfig.c

Legend:

branches/eam_branches/ipp-ops-20130712

branches/eam_branches/ipp-ops-20130712/ippTools

branches/eam_branches/ipp-ops-20130712/ippTools/src

branches/eam_branches/ipp-ops-20130712/ippTools/src/regtoolConfig.c

Download in other formats: