summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-02 14:52:12 -0500
committerDave Parks <davep@lindenlab.com>2011-05-02 14:52:12 -0500
commita25f8987032afede673b818fe7544975eba036b5 (patch)
treecfa15a82661d407fd9f2031e7dfd6f7e0be48bb2 /.hgignore
parentb9bb792c478d703c6442351ecb563c0a67f77111 (diff)
parent43083743747bece13301e2789ab36ed7e4886aba (diff)
merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 51b864651b..bd4f19a91e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ syntax: glob
.*.swp
#OSX image cache file
*.DS_Store
+*.orig
LICENSES
indra/.distcc
build-linux-*