summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorIsis Lovecruft <isis@torproject.org>2013-02-17 15:23:54 +0000
committerIsis Lovecruft <isis@torproject.org>2013-02-17 15:23:54 +0000
commit66d60a58ef752f9c9692dd8bdb0f61a5c1dfdb17 (patch)
tree016980342b8e2610f0010efddcab489a8d30db0a /.gitignore
parent364200c25e28d4996024dcf2f0644f5f20cde9ae (diff)
parent8d2fdc800de469420005f9c5deee4c342950ccc9 (diff)
Merge branch 'feature/check-recipient' into develop
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 283f175..0519df8 100644
--- a/.gitignore
+++ b/.gitignore
@@ -36,3 +36,12 @@ nosetests.xml
# Don't upload private things
*.private
+
+# Ignore emacs temporary files
+*~
+\#*\#
+
+# Ignore client logfiles and configs
+*.log
+*.conf
+*.config