summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-03-20 16:59:41 -0500
committerDave Parks <davep@lindenlab.com>2010-03-20 16:59:41 -0500
commit8424ceb20f7baa6d5cf980d2b9ae92121d1dcb20 (patch)
treeeb691b2e04d91d0f994f1fc04acd066e4d474384 /.hgignore
parent433996c2014d2f5ff5037d1fbb8bb5edbe818e1f (diff)
parent06e3d288e40e46204d84aed9c548a6ca529e78d8 (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 53ddf71bb7..94127df2d1 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-*