summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
committerPalmer <palmer@lindenlab.com>2009-12-07 16:03:56 -0800
commit85488f54148b2dba02eadcbd50ccbb552638c3c7 (patch)
treedbb248900527cac25c307970fb5c817b90b715e7 /.hgignore
parentee159d8e742a7281f304fc45b692c111706d294e (diff)
parent9d3968bb837828568bf58113b8315c8ca2e8dae1 (diff)
Merge of viewer 2 changes
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 53ddf71bb7..94127df2d1 100644
--- a/.hgignore
+++ b/.hgignore
@@ -9,6 +9,7 @@ syntax: glob
.*.swp
#OSX image cache file
*.DS_Store
+*.orig
LICENSES
indra/.distcc
indra/build-darwin-*