aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWim Lavrijsen <WLavrijsen@lbl.gov>2011-07-05 18:18:54 -0700
committerWim Lavrijsen <WLavrijsen@lbl.gov>2011-07-05 18:18:54 -0700
commit56be7be2ea8b1cb2aefc34f88b34df7fcb8f74bc (patch)
tree90ff5188a9b4eabf2fad0e41ad2096ca93a6d4dd /.hgignore
parentrtyper fixes and initial attempt at class type data members (diff)
parentExtension modules could not be compiled with the mingw32 compiler, (diff)
downloadpypy-56be7be2ea8b1cb2aefc34f88b34df7fcb8f74bc.tar.gz
pypy-56be7be2ea8b1cb2aefc34f88b34df7fcb8f74bc.tar.bz2
pypy-56be7be2ea8b1cb2aefc34f88b34df7fcb8f74bc.zip
merge default and minimize changes with default
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore3
1 files changed, 3 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index f04bf528f0..1ec1faeb9c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -1,6 +1,7 @@
syntax: glob
*.py[co]
*~
+.*.swp
syntax: regexp
^testresult$
@@ -43,6 +44,8 @@ syntax: regexp
^pypy/translator/benchmark/shootout_benchmarks$
^pypy/translator/goal/pypy-translation-snapshot$
^pypy/translator/goal/pypy-c
+^pypy/translator/goal/pypy-jvm
+^pypy/translator/goal/pypy-jvm.jar
^pypy/translator/goal/.+\.exe$
^pypy/translator/goal/.+\.dll$
^pypy/translator/goal/target.+-c$