summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-16 12:34:15 -0500
committerDave Parks <davep@lindenlab.com>2011-05-16 12:34:15 -0500
commit8a92612fd976b6e38383d9ee46be5b51053e0998 (patch)
tree0c06d99c2b6a8aaa5c78661b488ff8b59b83c523 /.hgignore
parent0b5f662c3bf1655b95dbb92ad3f16bae37ee04f4 (diff)
parentd6fda15c34896db3b911c3719871ce317edaab1d (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-*