aboutsummaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2009-05-27 14:20:18 -0400
committerNick Mathewson <nickm@torproject.org>2009-05-27 14:20:18 -0400
commit0e2618dd549701e0cede8e2b631f13b8f4071e8e (patch)
tree07d4d5eeb84b1acd92398303254b2439f4bd014b /.gitignore
parent181674e9bba9f4a0155f6172e437931d9560219c (diff)
parent1843f3936c7ee834a5974d1914bf749f8ea27e39 (diff)
downloadtor-0e2618dd549701e0cede8e2b631f13b8f4071e8e.tar
tor-0e2618dd549701e0cede8e2b631f13b8f4071e8e.tar.gz
Merge commit 'origin/maint-0.2.1'
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 8c80e09c1..6eacae932 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@
\#*\#
.#*
*~
+*.swp
# C stuff
*.o
# Diff droppings