[pypy-svn] pypy 32ptr-on-64bit: hg merge default

arigo commits-noreply at bitbucket.org
Thu Mar 24 09:07:38 CET 2011


Author: Armin Rigo <arigo at tunes.org>
Branch: 32ptr-on-64bit
Changeset: r42889:cb157cdd6e25
Date: 2011-03-24 09:07 +0100
http://bitbucket.org/pypy/pypy/changeset/cb157cdd6e25/

Log:	hg merge default

diff --git a/.hgsub b/.hgsub
deleted file mode 100644
--- a/.hgsub
+++ /dev/null
@@ -1,2 +0,0 @@
-greenlet = [svn]http://codespeak.net/svn/greenlet/trunk/c
-lib_pypy/pyrepl = [svn]http://codespeak.net/svn/pyrepl/trunk/pyrepl/pyrepl

diff --git a/.hgsubstate b/.hgsubstate
deleted file mode 100644
--- a/.hgsubstate
+++ /dev/null
@@ -1,2 +0,0 @@
-80037 greenlet
-80409 lib_pypy/pyrepl


More information about the Pypy-commit mailing list