From cf29488c587334874cf491a01a1f74ba3ac7de45 Mon Sep 17 00:00:00 2001
From: P. J. McDermott <pjm@nac.net>
Date: Mon, 30 Sep 2013 13:46:59 -0400
Subject: Merge branch 'new'.

---
(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..471106b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,15 @@
+# Swap and backup files
+.*.sw*
+.sw*
+*~
+Session.vim
+
+# Generated files
+*.html
+
+#*
+#!*/
+#!Makefile
+#!*.mdwn
+#!*.css
+#!.gitignore
--
cgit v0.9.1