summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
committerDave Parks <davep@lindenlab.com>2010-04-07 12:39:45 -0500
commitb6d3d2281b855448bbeec33b2d229222d75cd6b1 (patch)
tree99b5c533bcf19a4b02247e601939346b6f2151df /.hgignore
parent87cce27de3dd23a40d812a7c9000b1972cb4bca3 (diff)
parent3b7b578733867efaeb9359df69df1fe400de0f10 (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-*