summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-07-14 11:11:31 -0500
committerDave Parks <davep@lindenlab.com>2010-07-14 11:11:31 -0500
commit13202e744c35f0c6154cd0b582b1834896cacb79 (patch)
tree6a78237dd74c6270201afb6921e34e0b81dcfad5 /.hgignore
parentb46fff1ba1450d14424e676f31c0cacd921bedb0 (diff)
parent2dd3a6be720ed6ce7c17415fc8d81869cf46f3a0 (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-*