[pypy-svn] r68608 - in pypy/trunk/pypy: config doc/config lang rlib rpython translator/c

[cfbolz at codespeak.net]

Author: cfbolz
Date: Sat Oct 17 20:06:50 2009
New Revision: 68608

Added:
   pypy/trunk/pypy/config/pypyoption.py
      - copied unchanged from r68607, pypy/trunk/pypy/config/pypyoption.py.merge.tmp
   pypy/trunk/pypy/config/translationoption.py
      - copied unchanged from r68607, pypy/branch/tagged-pointers-framework2/pypy/config/translationoption.py
   pypy/trunk/pypy/doc/config/translation.taggedpointers.txt
      - copied unchanged from r68607, pypy/branch/tagged-pointers-framework2/pypy/doc/config/translation.taggedpointers.txt
   pypy/trunk/pypy/lang/
      - copied from r68607, pypy/branch/tagged-pointers-framework2/pypy/lang/
   pypy/trunk/pypy/rlib/
      - copied from r68607, pypy/branch/tagged-pointers-framework2/pypy/rlib/
   pypy/trunk/pypy/rpython/
      - copied from r68607, pypy/branch/tagged-pointers-framework2/pypy/rpython/
   pypy/trunk/pypy/translator/c/
      - copied from r68607, pypy/branch/tagged-pointers-framework2/pypy/translator/c/
Removed:
   pypy/trunk/pypy/config/pypyoption.py.merge.tmp
Log:
merge tagged-pointers-framework2 branch