Context Navigation

filerules-simple.mdc

Timestamp:

Dec 20, 2010, 2:30:45 PM (16 years ago)

Author:

watersc1

Message:

Attempting to bring branch in sync with trunk

Location:

branches/czw_branch/20101203

Files:

Property svn:mergeinfo changed

/branches/eam_branches/ipp-20101103 (added)	merged: 29657-29658,29660-29662,29664,29680-29684,29692-29694,29714-29715,29734-29735,29778-29779,29782-29791,29793-29798,29810-29812,29814-29828,29834-29858,29870,29872-29880,29904-29906,29910-29918,29920
/trunk (added)	merged: 29919,29921-29942,29950-29958,29960-29962,29964,29966,29968-29969,29971-29973,29976-29978,29980-29981,29983,29985-29986,29989-30001,30005,30016,30024-30026,30031,30034-30036,30038,30040-30042,30044,30049-30050,30054,30056,30058,30060,30062,30064,30066-30067,30069-30071,30073,30075,30077-30078,30099-30100,30111,30113
/branches/czw_branch/20100427	removed
/branches/czw_branch/20100519	removed
/branches/czw_branch/20100817	removed
/branches/eam_branches/ipp-20100823	removed
/branches/haf_branches/ipp.20100512	removed
/branches/pap	removed

-              r29889
+              r30118
 PPSUB.REF.CONV.VARIANCE      OUTPUT {OUTPUT}.refConv.wt.fits      VARIANCE        NONE       FPA        TRUE      NONE
+PPSUB.FORCED1.SOURCES        OUTPUT {OUTPUT}.frc1.cmf             CMF             NONE       FPA        TRUE      NONE
+PPSUB.FORCED2.SOURCES        OUTPUT {OUTPUT}.frc2.cmf             CMF             NONE       FPA        TRUE      NONE
+PPSUB.POS1.SOURCES           OUTPUT {OUTPUT}.pos1.cmf             CMF             NONE       FPA        TRUE      NONE
+PPSUB.POS2.SOURCES           OUTPUT {OUTPUT}.pos2.cmf             CMF             NONE       FPA        TRUE      NONE
 PPSTACK.OUTPUT.COMP          OUTPUT {OUTPUT}.fits                 IMAGE           COMP_IMG   FPA        TRUE      NONE
 PPSTACK.OUTPUT.RAW           OUTPUT {OUTPUT}.fits                 IMAGE           NONE       FPA        TRUE      NONE

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