diff options
| author | Chris McDonough <chrism@plope.com> | 2012-10-27 19:45:51 -0400 |
|---|---|---|
| committer | Chris McDonough <chrism@plope.com> | 2012-10-27 19:45:51 -0400 |
| commit | 220435320613530bde80dd1c4a38a3e719f4af5d (patch) | |
| tree | 7d1b5b1b367b6fc4b5d16cb88e3f8976acf6ece5 /.gitignore | |
| parent | 0a1fb171514f4a41cf8679ef61c06397854dde07 (diff) | |
| parent | 4a6cca62ddf33580b1de210ef5ca54bfb2769243 (diff) | |
| download | pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.tar.gz pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.tar.bz2 pyramid-220435320613530bde80dd1c4a38a3e719f4af5d.zip | |
Merge branch 'master' into 1.4-branch
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 8e2f83e7d..5fa2a2ee4 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,7 @@ *.pt.py *.txt.py *~ +.*.swp .coverage .tox/ nosetests.xml @@ -21,3 +22,4 @@ bookenv/ jyenv/ pypyenv/ env*/ +venv/ |