[pypy-svn] r44294 - in pypy/dist/pypy: annotation annotation/test doc doc/config doc/discussion interpreter lang/js lib/distributed module/_curses module/fcntl module/posix module/termios rlib rpython rpython/lltypesystem rpython/lltypesystem/test rpython/module rpython/test translator/c translator/c/src translator/c/test

arigo at codespeak.net arigo at codespeak.net
Fri Jun 15 15:56:01 CEST 2007


Author: arigo
Date: Fri Jun 15 15:55:56 2007
New Revision: 44294

Added:
   pypy/dist/pypy/annotation/builtin.py
      - copied unchanged from r44293, pypy/dist/pypy/annotation/builtin.py.merge.tmp
   pypy/dist/pypy/annotation/classdef.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/annotation/classdef.py
   pypy/dist/pypy/annotation/signature.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/annotation/signature.py
   pypy/dist/pypy/annotation/test/test_signature.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/annotation/test/test_signature.py
   pypy/dist/pypy/doc/config/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/doc/config/
   pypy/dist/pypy/doc/discussion/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/doc/discussion/
   pypy/dist/pypy/doc/download.txt
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/doc/download.txt
   pypy/dist/pypy/doc/rffi.txt
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/doc/rffi.txt
   pypy/dist/pypy/interpreter/error.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/interpreter/error.py
   pypy/dist/pypy/lang/js/newparser.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/lang/js/newparser.py
   pypy/dist/pypy/lib/distributed/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/lib/distributed/
   pypy/dist/pypy/module/_curses/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/module/_curses/
   pypy/dist/pypy/module/fcntl/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/module/fcntl/
   pypy/dist/pypy/module/posix/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/module/posix/
   pypy/dist/pypy/module/termios/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/module/termios/
   pypy/dist/pypy/rlib/ros.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rlib/ros.py
   pypy/dist/pypy/rlib/rtermios.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rlib/rtermios.py
   pypy/dist/pypy/rpython/extfunc.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/extfunc.py
   pypy/dist/pypy/rpython/extfuncregistry.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/extfuncregistry.py
   pypy/dist/pypy/rpython/extfunctable.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/extfunctable.py
   pypy/dist/pypy/rpython/llinterp.py
      - copied unchanged from r44293, pypy/dist/pypy/rpython/llinterp.py.merge.tmp
   pypy/dist/pypy/rpython/lltypesystem/lloperation.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/lltypesystem/lloperation.py
   pypy/dist/pypy/rpython/lltypesystem/rffi.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/lltypesystem/rffi.py
   pypy/dist/pypy/rpython/lltypesystem/rfficache.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/lltypesystem/rfficache.py
   pypy/dist/pypy/rpython/lltypesystem/test/test_rffi.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/lltypesystem/test/test_rffi.py
   pypy/dist/pypy/rpython/lltypesystem/test/test_rfficache.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/lltypesystem/test/test_rfficache.py
   pypy/dist/pypy/rpython/lltypesystem/typecache.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/lltypesystem/typecache.py
   pypy/dist/pypy/rpython/module/
      - copied from r44293, pypy/branch/kill-ctypes/pypy/rpython/module/
   pypy/dist/pypy/rpython/rbuiltin.py
      - copied unchanged from r44293, pypy/dist/pypy/rpython/rbuiltin.py.merge.tmp
   pypy/dist/pypy/rpython/test/test_extfunc.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/rpython/test/test_extfunc.py
   pypy/dist/pypy/rpython/test/test_rbuiltin.py
      - copied unchanged from r44293, pypy/dist/pypy/rpython/test/test_rbuiltin.py.merge.tmp
   pypy/dist/pypy/translator/c/external.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/external.py
   pypy/dist/pypy/translator/c/extfunc.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/extfunc.py
   pypy/dist/pypy/translator/c/funcgen.py
      - copied unchanged from r44293, pypy/dist/pypy/translator/c/funcgen.py.merge.tmp
   pypy/dist/pypy/translator/c/genc.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/genc.py
   pypy/dist/pypy/translator/c/node.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/node.py
   pypy/dist/pypy/translator/c/primitive.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/primitive.py
   pypy/dist/pypy/translator/c/src/ll_os.h
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/src/ll_os.h
   pypy/dist/pypy/translator/c/test/test_extfunc.py
      - copied unchanged from r44293, pypy/branch/kill-ctypes/pypy/translator/c/test/test_extfunc.py
Removed:
   pypy/dist/pypy/annotation/builtin.py.merge.tmp
   pypy/dist/pypy/rpython/llinterp.py.merge.tmp
   pypy/dist/pypy/rpython/rbuiltin.py.merge.tmp
   pypy/dist/pypy/rpython/test/test_rbuiltin.py.merge.tmp
   pypy/dist/pypy/translator/c/funcgen.py.merge.tmp
Log:
(fijal, arigo)  Merge the kill-ctypes branch.




More information about the Pypy-commit mailing list