From 0159cdb77de9357cb9459f6daef0f025d20c2a3c Mon Sep 17 00:00:00 2001
From: Andrew Johnson <anj@aps.anl.gov>
Date: Thu, 30 Nov 2017 12:07:10 -0600
Subject: [PATCH] Unify .gitignore files

---
 .gitignore | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.gitignore b/.gitignore
index ca4dbdd..94f64f1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,19 @@
-/bin/
 /cfg/
+/bin/
 /lib/
-/include/
 /db/
 /dbd/
-/documentation/html
-/documentation/*.tag
+/html/
+/include/
+/templates/
 /configure/*.local
 /configure/RELEASE.*
 /configure/CONFIG_SITE.*
-/!configure/ExampleRELEASE.local
+/documentation/html
+/documentation/*.tag
+O.*/
+/QtC-*
 envPaths
-**/O.*
-QtC-*
+*.orig
+*.log
+.*.swp