summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDon Kjer <don@lindenlab.com>2012-09-24 19:20:28 +0000
committerDon Kjer <don@lindenlab.com>2012-09-24 19:20:28 +0000
commit8af68c8771077518585cf332ba0e1e53f18c76c7 (patch)
treefc7d6e631f619ab624f498003d9f3cda4117d321
parent8edf8b002db02af0abca1b06802bc0041f25c379 (diff)
Removing .orig and .rej files from ignore
-rw-r--r--.hgignore4
1 files 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