summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-08-31 16:37:40 -0500
committerDave Parks <davep@lindenlab.com>2010-08-31 16:37:40 -0500
commite68f9e566b5aeb5341f5adea0b8a6ccde86ee93d (patch)
tree6454bf6b303d03f89e567a6ea9cfee7c85aaa1ac /.hgignore
parent3cabca8df62ae8ee815dd7d885f14f5a7d0ea98d (diff)
parent771195865c4fb336f573025e9a7a22313bfb6cb8 (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 1221b80357..dd878b0c16 100644
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ syntax: glob
.*.swp
#OSX image cache file
*.DS_Store
+*.orig
LICENSES
indra/.distcc
indra/build-darwin-*