summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorPalmer <palmer@lindenlab.com>2009-11-11 15:16:49 -0800
committerPalmer <palmer@lindenlab.com>2009-11-11 15:16:49 -0800
commit6f3536d5979efa6db28098056ab5e3a158020225 (patch)
treeaae087995fa1c3df3cebbdf345fca7a2e7c1b548 /.hgignore
parent7fa698252060a72be6b5ebc52f0ff01bcea6134c (diff)
parent25d8cf689aa04a1bd4ebb336714730d29040d05c (diff)
Merged in viewer 2 changes, adjusted xui problems, added mesh folder type and more mesh inventory type info
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore7
1 files changed, 6 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index 454be00dbf..4d98acf5d9 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-*
@@ -27,7 +29,6 @@ indra/newview/fmod.dll
indra/newview/mozilla-theme
indra/newview/mozilla-universal-darwin.tgz
indra/newview/res-sdl
-indra/newview/skins
indra/newview/vivox-runtime
indra/server-linux-*
indra/test/linden_file.dat
@@ -48,3 +49,7 @@ tarfile_tmp
^indra/web/dataservice/lib/shared/vault.*
^indra/web/dataservice/vendor.*
glob:indra/newview/dbghelp.dll
+glob:*.cpp.orig
+glob:*.cpp.bak
+glob:*.h.bak
+glob:*.h.orig