Automated merge with ssh://hg.lindenlab.com/viewer/viewer-2-0/

52cb2fe4 · Eric M. Tulla (BigPapi) · 33bced54 · 22e6c3f9 · 52cb2fe4
Commit 52cb2fe4 authored 15 years ago by Eric M. Tulla (BigPapi)
--- 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-*