aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAntonio Cuni <anto.cuni@gmail.com>2011-03-22 16:53:08 +0100
committerAntonio Cuni <anto.cuni@gmail.com>2011-03-22 16:53:08 +0100
commitd54efaf7064c6a9aa37c3ccdd0d6e007b8b03a4e (patch)
tree66c35629feb1c0dfabefee4a834416165fe0fd47 /.hgignore
parentReplace 'call_may_force' with 'call_release_gil' in order to call (diff)
parentchange a pair of range to xrange, to remove 1 guard each during annotation (diff)
downloadpypy-d54efaf7064c6a9aa37c3ccdd0d6e007b8b03a4e.tar.gz
pypy-d54efaf7064c6a9aa37c3ccdd0d6e007b8b03a4e.tar.bz2
pypy-d54efaf7064c6a9aa37c3ccdd0d6e007b8b03a4e.zip
partial merge of default; _ctypes/function.py had very hard conflicts, I'll try to manually merge the changes in the next commits
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore6
1 files changed, 6 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 3c73d5365c..47d4b0fa26 100644
--- a/.hgignore
+++ b/.hgignore
@@ -13,9 +13,11 @@ syntax: regexp
^pypy/module/cpyext/test/.+\.o$
^pypy/module/cpyext/test/.+\.obj$
^pypy/module/cpyext/test/.+\.manifest$
+^pypy/module/test_lib_pypy/ctypes_tests/.+\.o$
^pypy/doc/.+\.html$
^pypy/doc/basicblock\.asc$
^pypy/doc/.+\.svninfo$
+^pypy/translator/c/src/dtoa.o$
^pypy/translator/c/src/libffi_msvc/.+\.obj$
^pypy/translator/c/src/libffi_msvc/.+\.dll$
^pypy/translator/c/src/libffi_msvc/.+\.lib$
@@ -50,6 +52,7 @@ syntax: regexp
^pypy/doc/discussion/.+\.html$
^include/.+\.h$
^include/.+\.inl$
+^pypy/doc/_build/.*$
^pypy/doc/config/.+\.html$
^pypy/doc/config/style\.css$
^pypy/doc/jit/.+\.html$
@@ -60,3 +63,6 @@ syntax: regexp
^pypy/doc/image/stackless_informal\.png$
^pypy/doc/image/parsing_example.+\.png$
^pypy/module/test_lib_pypy/ctypes_tests/_ctypes_test\.o$
+^compiled
+^.git/
+^release/