From 8af68c8771077518585cf332ba0e1e53f18c76c7 Mon Sep 17 00:00:00 2001
From: Don Kjer <don@lindenlab.com>
Date: Mon, 24 Sep 2012 19:20:28 +0000
Subject: Removing .orig and .rej files from ignore

---
 .hgignore | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.hgignore b/.hgignore
index 06d31e2f88..c845758e7c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -10,7 +10,7 @@ syntax: glob
 .*.swp
 #OSX image cache file
 *.DS_Store
-*.orig
+#*.orig
 LICENSES
 indra/.distcc
 build-linux-*
@@ -74,4 +74,4 @@ glob:indra/newview/filters.xml
 glob:indra/newview/avatar_icons_cache.txt
 glob:indra/newview/avatar_lad.log
 glob:*.diff
-*.rej
+#*.rej
-- 
cgit v1.2.3