summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave SIMmONs <simon@lindenlab.com>2011-05-24 10:51:09 -0700
committerDave SIMmONs <simon@lindenlab.com>2011-05-24 10:51:09 -0700
commit3dfb4944ed916f9a251078a2614a854b9de0315d (patch)
tree251a82d2511132632d12e36c8e8be0d7bf5b11cf /.hgignore
parent1a5b3b0a9091a72fd5e5fb395f7f0c97b0fd502c (diff)
parente5752934be74a84e6ec0ff8cb96974bd1e9060ec (diff)
Merge latest from lindenlab/viewer-development
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-*