diff options
| author |   Antonio Cuni <anto.cuni@gmail.com> | 2011-01-11 10:14:51 +0100 |
|---|---|---|
| committer | Antonio Cuni <anto.cuni@gmail.com> | 2011-01-11 10:14:51 +0100 |
| commit | cf7bda458151a750038c4a303b79cd47532c09cd (patch) | |
| tree | 70566c212671278f6a620a669d72fb8d76f9f532 /.hgignore | |
| parent | slightly refactor the code to make it easier to merge the default branch (diff) | |
| parent | Merged head. (diff) | |
| download | pypy-cf7bda458151a750038c4a303b79cd47532c09cd.tar.gz pypy-cf7bda458151a750038c4a303b79cd47532c09cd.tar.bz2 pypy-cf7bda458151a750038c4a303b79cd47532c09cd.zip | |
try again to merge the default branch
Diffstat (limited to '.hgignore')
| -rw-r--r-- | .hgignore | 13 |
1 files changed, 11 insertions, 2 deletions
@@ -5,17 +5,25 @@ syntax: glob syntax: regexp ^testresult$ ^site-packages$ -^pypy/module/cpyext/src/.+\.o$ +^bin$ ^pypy/bin/pypy-c -^pypy/translator/jvm/src/pypy/.+\.class$ +^pypy/module/cpyext/src/.+\.o$ +^pypy/module/cpyext/src/.+\.obj$ ^pypy/module/cpyext/test/.+\.errors$ ^pypy/module/cpyext/test/.+\.o$ +^pypy/module/cpyext/test/.+\.obj$ +^pypy/module/cpyext/test/.+\.manifest$ ^pypy/doc/.+\.html$ ^pypy/doc/basicblock\.asc$ ^pypy/doc/.+\.svninfo$ +^pypy/translator/c/src/libffi_msvc/.+\.obj$ +^pypy/translator/c/src/libffi_msvc/.+\.dll$ +^pypy/translator/c/src/libffi_msvc/.+\.lib$ +^pypy/translator/c/src/libffi_msvc/.+\.exp$ ^pypy/translator/jvm/\.project$ ^pypy/translator/jvm/\.classpath$ ^pypy/translator/jvm/eclipse-bin$ +^pypy/translator/jvm/src/pypy/.+\.class$ ^pypy/translator/benchmark/docutils$ ^pypy/translator/benchmark/templess$ ^pypy/translator/benchmark/gadfly$ @@ -25,6 +33,7 @@ syntax: regexp ^pypy/translator/goal/pypy-translation-snapshot$ ^pypy/translator/goal/pypy-c ^pypy/translator/goal/.+\.exe$ +^pypy/translator/goal/.+\.dll$ ^pypy/translator/goal/target.+-c$ ^pypy/_cache$ ^site-packages/.+\.egg$ |