summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-03 11:51:36 -0500
committerEric M. Tulla (BigPapi) <tulla@lindenlab.com>2009-11-03 11:51:36 -0500
commit52cb2fe46db89f90a629f957ca30bc10b5c52f3d (patch)
tree5119d0287877de337a86f1bae53f63c8ab481838
parent33bced543b09312105ed826780bd9c55918b2add (diff)
parent22e6c3f952428750e68d08ed8788be37f20498a1 (diff)
Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/
-rw-r--r--.hgignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 454be00dbf..cff2a14b94 100644
--- a/.hgignore
+++ b/.hgignore
@@ -7,6 +7,8 @@ syntax: glob
# Emacs temp files
*~
.*.swp
+#OSX image cache file
+*.DS_Store
LICENSES
indra/.distcc
indra/build-darwin-*