diff options
| author | Jeff Forcier <jeff@bitprophet.org> | 2013-03-19 13:36:52 -0700 |
|---|---|---|
| committer | Jeff Forcier <jeff@bitprophet.org> | 2013-03-19 13:36:52 -0700 |
| commit | a7ee2509e48d7e2bb533ce5e50796b9a887c7a8a (patch) | |
| tree | 69ac6ffb7193e8b64bd97fd03db70c6a21485480 /.gitignore | |
| parent | 5f5137414c91c931f04522b1bb8c2800294d6a90 (diff) | |
| parent | d5db60329701df2423909773af9cc9aa5df4d4f6 (diff) | |
Merge branch 'master' into 112-int
Conflicts:
paramiko/win_pageant.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1,6 +1,7 @@ *.pyc build/ dist/ +.tox/ paramiko.egg-info/ test.log docs/ |