summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorLeslie Linden <none@none>2011-06-08 13:41:40 -0700
committerLeslie Linden <none@none>2011-06-08 13:41:40 -0700
commitde78d17e912b7e2a4c563a7a428f11cce33644c0 (patch)
tree6c415389f180f6a5d879b050670fd6cd3d987229 /.hgignore
parent888b39c283e53fd128778e70e231bcb6053de4b8 (diff)
parent1361eeae4e4538c175a32d48246897c4659cc26c (diff)
Merge from viewer-experience
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-*