From 78dc06a87f82ed19e3eebe1f16dc6c1bdaf5fbc5 Mon Sep 17 00:00:00 2001
From: James Moger <james.moger@gitblit.com>
Date: Tue, 31 Jan 2012 09:35:30 -0500
Subject: [PATCH] Merge pull request #6 from lemval/master

---
 .gitignore |   43 ++++++++++++++++++++++++++-----------------
 1 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/.gitignore b/.gitignore
index 389f663..6988e3b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,17 +1,26 @@
-/temp
-/lib
-/ext
-/build
-/keystore
-/*.zip
-/gitblit.properties
-/users.properties
-/site
-/git
-/target
-/build.properties
-/war
-/*.war
-/proposals
-/*.jar
-/federation.properties
\ No newline at end of file
+/temp
+/lib
+/ext
+/build
+/keystore
+/*.zip
+/gitblit.properties
+/users.properties
+/site
+/git
+/target
+/build.properties
+/war
+/*.war
+/proposals
+/*.jar
+/federation.properties
+/mailtest.properties
+/.settings/*.prefs
+/src/WEB-INF/reference.properties
+/bin/
+/.settings/
+/javadoc
+/express
+/build-demo.xml
+/users.conf

--
Gitblit v1.9.1