summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorRick Pasetto <rick@lindenlab.com>2009-11-03 09:44:09 -0800
committerRick Pasetto <rick@lindenlab.com>2009-11-03 09:44:09 -0800
commita0bbe8d8eb98aaba1dc55c7cbcb70d58125781ce (patch)
tree279f3421a88280d6003d6973dcb5556702e2c52f /.hgignore
parentc59e2d21174415842b1418c5f389becb7c013706 (diff)
parentc9d121dd01625790cb963372c861f8e4072430d2 (diff)
merge from remote repo
Diffstat (limited to '.hgignore')
-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-*