summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2011-05-16 16:11:56 -0500
committerDave Parks <davep@lindenlab.com>2011-05-16 16:11:56 -0500
commit26f321bf6530734173792f92316b32c470cc1b20 (patch)
treeb6c913bc714ce29ee559a0da49c6318051637789 /.hgignore
parent113f532ee57eeeca4dc7eb6ca05f923f1f3543d3 (diff)
parent8ae550996c70df16b707f6773666b93409123689 (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-*