[pypy-svn] r67512 - in pypy/trunk/pypy: jit/backend/test jit/backend/x86 jit/backend/x86/test module/pypyjit/test

[arigo at codespeak.net]

Author: arigo
Date: Sat Sep  5 12:23:41 2009
New Revision: 67512

Added:
   pypy/trunk/pypy/jit/backend/test/
      - copied from r67511, pypy/branch/no-recompilation-merge/pypy/jit/backend/test/
   pypy/trunk/pypy/jit/backend/x86/assembler.py
      - copied unchanged from r67511, pypy/trunk/pypy/jit/backend/x86/assembler.py.merge.tmp
   pypy/trunk/pypy/jit/backend/x86/regalloc.py
      - copied unchanged from r67511, pypy/branch/no-recompilation-merge/pypy/jit/backend/x86/regalloc.py
   pypy/trunk/pypy/jit/backend/x86/runner.py
      - copied unchanged from r67511, pypy/branch/no-recompilation-merge/pypy/jit/backend/x86/runner.py
   pypy/trunk/pypy/jit/backend/x86/test/
      - copied from r67511, pypy/branch/no-recompilation-merge/pypy/jit/backend/x86/test/
   pypy/trunk/pypy/module/pypyjit/test/
      - copied from r67511, pypy/branch/no-recompilation-merge/pypy/module/pypyjit/test/
Removed:
   pypy/trunk/pypy/jit/backend/x86/assembler.py.merge.tmp
Log:
Merge the "no-recompilation-merge" branch.