Author: mattip
Branch: matrixmath-dot
Changeset: r51431:d512cc3a2cf4
Date: 2012-01-17 21:06 +0200
http://bitbucket.org/pypy/pypy/changeset/d512cc3a2cf4/
Log:merge from default
diff --git a/.hgignore b/.hgignore
--- a/.hgignore
+++ b/.hgignore
@@ -2,6 +2,9 @@
*.py[co]
*~
.*.swp
+.idea
+.pro
Author: mattip
Branch: matrixmath-dot
Changeset: r50191:5a5cfa32fe70
Date: 2011-12-05 09:04 +0200
http://bitbucket.org/pypy/pypy/changeset/5a5cfa32fe70/
Log:merge
diff --git a/pypy/module/micronumpy/interp_numarray.py
b/pypy/module/micronumpy/interp_numarray.py
--- a/pypy/module/micronumpy/i
Author: mattip
Branch: matrixmath-dot
Changeset: r50185:55693d8b2b89
Date: 2011-12-04 21:49 +0200
http://bitbucket.org/pypy/pypy/changeset/55693d8b2b89/
Log:Merge with default
diff --git a/lib_pypy/_sha.py b/lib_pypy/_sha.py
--- a/lib_pypy/_sha.py
+++ b/lib_pypy/_sha.py
@@ -1,5 +1,5 @@
#!/us