From: John Darrington <john@marilyn.intra>
Date: Sat, 26 Jul 2008 06:12:01 +0000 (+0800)
Subject: Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp
X-Git-Tag: v0.7.0~9
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?p=pspp-builds.git;a=commitdiff_plain;h=f6b8e421cd29ae0aef4018bbe2e1a06d0bef57df

Merge branch 'master' of ssh://jmd@git.sv.gnu.org/srv/git/pspp

Conflicts:

	src/math/ChangeLog
---

f6b8e421cd29ae0aef4018bbe2e1a06d0bef57df
diff --cc src/math/ChangeLog
index b3c9386d,dc06ded8..78fbfbc1
--- a/src/math/ChangeLog
+++ b/src/math/ChangeLog
@@@ -1,10 -1,17 +1,24 @@@
 +2008-07-24   John Darrington <john@darrington.wattle.id.au>
 +
 +	* merge.c merge.h sort.c sort.h: Removed the value_cnt associated
 +	with case ordering.  This ensures that the casereader returned by
 +	sort_execute now has the same dimensions as the casereader passed 
 +	in.
 +
+ 2008-07-24  Jason H Stover  <jhs@math.gcsu.edu>
+ 
+ 	* covariance-matrix.c (covariance_pass_two): Dropped weight
+ 	argument. Corrected update of the entries of the covariance
+ 	matrix. 
+ 
+ 	* covariance-matrix.c (column_iterate): Dropped weight
+ 	argument. Corrected update of the entries of the covariance
+ 	matrix. 
+ 
+ 	* covariance-matrix.c (covariance_update_categorical_numeric):
+ 	Dropped weight argument. Corrected update of the entries of the
+ 	covariance matrix.
+ 
  2008-07-17  Jason H Stover  <jhs@math.gcsu.edu>
  
  	* covariance-matrix.c (covariance_update_categorical_numeric):