Changeset 21373

Timestamp:

Feb 5, 2009, 5:16:47 PM (17 years ago)

Author:

Paul Price

Message:

Merging pap_branch_20090128 into mainline.

File:

• trunk/Branches.txt (modified) (1 diff)

trunk/Branches.txt

@@ -10 +10 @@
 
 pap_branch_20090128
-- 
-* psModules: Moving "readout->weight" to "readout->variance", adding covariance
-* ppArith: Moving "readout->weight" to "readout->variance"
-* ppImage: Moving "readout->weight" to "readout->variance"
-* ppMerge: Moving "readout->weight" to "readout->variance"
-* ppSim: Moving "readout->weight" to "readout->variance"
-* ppStack: Moving "readout->weight" to "readout->variance"
-* ppStats: Moving "readout->weight" to "readout->variance"
-* ppSub: Moving "readout->weight" to "readout->variance"
-* pswarp: Moving "readout->weight" to "readout->variance"
-* psphot: Moving "readout->weight" to "readout->variance"
-* ippconfig: Moving "weight" to "variance"
-* ippScripts: Moving "weight" to "variance"
+- Moving "readout->weight" to "readout->variance", adding covariance
+* psModules: Merged in head 2009-02-05
+* ppArith: No change; no need to merge, but tagged anyway.
+* ppImage: Merged in head 2009-02-05
+* ppMerge: Merged in head 2009-02-05
+* ppSim: Merged in head 2009-02-05
+* ppStack: Merged in head 2009-02-05
+* ppStats: No change; no need to merge, but tagged anyway.
+* ppSub: No changes due to simultaneous work by EAM.
+* pswarp: Merged in head 2009-02-05
+* psphot: Merged in head 2009-02-05
+* ippconfig: Merged in head 2009-02-05
+* ippScripts: Merged in head 2009-02-05
 
 pap_branch_20090108