From 7ba200451e342b0acedf2bf4db88851e65efc8df Mon Sep 17 00:00:00 2001
From: Mark Donnelly <mark@painless-security.com>
Date: Wed, 24 Jun 2015 15:27:24 -0400
Subject: [PATCH] Ignore build and editor junk files

---
 .gitignore | 31 ++++++++++++++++++++++++++++++-
 1 file changed, 30 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b6c2844..3ee7615 100644
--- a/.gitignore
+++ b/.gitignore
@@ -81,4 +81,33 @@ Doxyfile
 json_gssapi/build
 json_gssapi/debug
 json_gssapi/manual
-./test/
\ No newline at end of file
+./test/
+
+#
+# Build process
+#################
+build
+
+
+#
+# Emacs
+###############
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
+
+#
+# Vim
+#################
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
+
-- 
2.1.4