[pypy-commit] pypy default: merge heads

[rlamy]

Author: Ronan Lamy <ronan.l...@gmail.com>
Branch: 
Changeset: r66726:452fdf299c65
Date: 2013-08-31 15:38 +0100
http://bitbucket.org/pypy/pypy/changeset/452fdf299c65/

Log:    merge heads

diff --git a/rpython/translator/c/src/mem.c b/rpython/translator/c/src/mem.c
--- a/rpython/translator/c/src/mem.c
+++ b/rpython/translator/c/src/mem.c
@@ -49,7 +49,7 @@
   if (count > 0)
     {
       char *env = getenv("PYPY_ALLOC");
-      fprintf(stderr, "debug_alloc.h: %ld mallocs left", count);
+      fprintf(stderr, "mem.c: %ld mallocs left", count);
       if (env && *env)
         {
           fprintf(stderr, " (most recent first):\n");
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit