summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-05-17 18:47:51 -0400
committerOz Linden <oz@lindenlab.com>2011-05-17 18:47:51 -0400
commitcb936d097fd40c743895cb35fce6b292c66e5210 (patch)
treec554c33c7576aa567ca2b32ad06ee9af83977059 /.hgignore
parent32313dd3c6396324ea8f13285a69c01f38fe1cfc (diff)
parentbd37b14e9217935b9d70faf04c835c9d4aeda9c7 (diff)
pull back fix for STORM-1260 from beta branch
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-*