diff options
| author | Jon Bergli Heier <snakebite@jvnv.net> | 2010-05-25 20:07:55 +0200 |
|---|---|---|
| committer | Jon Bergli Heier <snakebite@jvnv.net> | 2010-05-25 20:07:55 +0200 |
| commit | 2066a309d2672f6b071da87c2fb156a2af15c5d3 (patch) | |
| tree | 8b353d5d6bdae666ddb0ed5407c6030bcef9c4d7 /.gitignore | |
| parent | b97e85feef6b4dad4add23d17e37fd5ee976e1e3 (diff) | |
| parent | f9e9af49233ba05a87f6c00c387134394443bfb3 (diff) | |
Merge branch 'master' into ipv6
Conflicts:
fot.py
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -1 +1,2 @@ *.pyc +*.swp |