Context Navigation

filerules-split.mdc

Timestamp:

Feb 6, 2014, 11:48:53 AM (12 years ago)

Author:

eugene

Message:

merging changes from trunk

Location:

branches/eam_branches/ipp-20131211

Files:

Property svn:mergeinfo changed

/branches/bills_branches/bills_201312 (added)	merged: 36383,36386,36388-36396,36406-36407,36409-36412,36415-36420,36422-36427,36433,36436-36439
/tags/ipp-20140114 (added)	merged: 36444-36446,36448,36450
/trunk (added)	merged: 36397,36403-36404,36413,36421,36428-36431,36434-36435,36441,36447,36452-36457,36459,36463,36476-36478

Property svn:mergeinfo changed

/branches/bills_branches/bills_201312/ippconfig (added)	merged: 36393,36420,36425-36426,36437-36438
/tags/ipp-20140114/ippconfig (added)	merged: 36446,36448
/trunk/ippconfig (added)	merged: 36403-36404,36441,36454

r36375	r36480
262	262	PSPHOT.STACK.RESID OUTPUT {OUTPUT}.stk.{FILE.ID}.res.fits IMAGE COMP_SUB FPA TRUE NONE
263	263	PSPHOT.STACK.CONFIG OUTPUT {OUTPUT}.psphotStack.mdc TEXT NONE FPA TRUE NONE
	264
	265	PSPHOT.FULLFORCE.OUTPUT OUTPUT {OUTPUT}.cmf CMF NONE FPA TRUE NONE
264	266
265	267	SOURCE.PLOT.RAW.MOMENTS OUTPUT {OUTPUT}.{CHIP.NAME}.mnt.png KAPA NONE CHIP TRUE NONE

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