summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorAtsushi Odagiri <aodagx@gmail.com>2010-11-27 15:08:31 +0900
committerAtsushi Odagiri <aodagx@gmail.com>2010-11-27 15:08:31 +0900
commitcd2f78c893ce6ae98004189a1a0a649fac96d033 (patch)
tree5ab84f72e6bf0476d7d40841f3341aaf9a4e54a4 /.gitignore
parentba32a8d0dcee7f3cef231e08ed60d52fbf60ed4f (diff)
parent4d76ed6f46304d43a6b95da7a4d5388527bf6c1e (diff)
downloadpyramid-cd2f78c893ce6ae98004189a1a0a649fac96d033.tar.gz
pyramid-cd2f78c893ce6ae98004189a1a0a649fac96d033.tar.bz2
pyramid-cd2f78c893ce6ae98004189a1a0a649fac96d033.zip
Merge remote branch 'remotes/upstream/master'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore10
1 files changed, 7 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 09439306e..ae0b17b8e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,11 +1,15 @@
*.egg
*.egg-info
*.pyc
+*$py.class
*.pt.py
*.txt.py
.coverage
-env26
-env24
-env27
+tutorial.db
+env26/
+env24/
+env27/
+jyenv/
+pypyenv/
build/
dist/