summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-07 13:50:47 -0500
committerDave Parks <davep@lindenlab.com>2010-04-07 13:50:47 -0500
commit666c7c429b7f38f7c93bf6c287157c2e3ab9ccd7 (patch)
tree8f3e9399dbc5cab6c28c5992b579368bb0aa8949 /.hgignore
parent8ac6310020bd2d524c97c729c29a0afe4a529ecf (diff)
parentb6d3d2281b855448bbeec33b2d229222d75cd6b1 (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-*