From: Marc Fauconneau <prunedtree@gmail.com>
Date: Sun, 30 Aug 2009 08:24:25 +0000 (+0900)
Subject: Merge branch 'master' of git@github.com:prunedtree/factor
X-Git-Tag: 0.97~5324^2~23^2~3
X-Git-Url: https://gitweb.factorcode.org/gitweb.cgi?p=factor.git;a=commitdiff_plain;h=bf15648b4d90434dbef2b310d204b6e068209306

Merge branch 'master' of git@github.com:prunedtree/factor

Conflicts:
	basis/math/matrices/matrices.factor
---

bf15648b4d90434dbef2b310d204b6e068209306
diff --cc basis/math/matrices/matrices.factor
index 3203355bb9,21d9a97adf..4ba8e1d3d9
--- a/basis/math/matrices/matrices.factor
+++ b/basis/math/matrices/matrices.factor
@@@ -136,7 -61,11 +136,7 @@@ PRIVATE
  
  : cross-zip ( seq1 seq2 -- seq1xseq2 )
      [ [ 2array ] with map ] curry map ;
 -
 -<PRIVATE
      
 -: m^n ( m n -- m ) 
 +: m^n ( m n -- n ) 
      make-bits over first length identity-matrix
--    [ [ dupd m. ] when [ dup m. ] dip ] reduce nip ;
 -
 -PRIVATE>
++    [ [ dupd m. ] when [ dup m. ] dip ] reduce nip ;