summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorLeyla Farazha <leyla@lindenlab.com>2011-06-07 17:16:49 -0700
committerLeyla Farazha <leyla@lindenlab.com>2011-06-07 17:16:49 -0700
commit1361eeae4e4538c175a32d48246897c4659cc26c (patch)
tree19687f65cc1c51b3247d0d1cd665b19c1a41a1e4 /.hgignore
parentbff172b374fa12e646d427e09f2ffac4289ab654 (diff)
parentcf31723a1a258e0452dd26d9f5eb5fcdac290e05 (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-*