summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-28 10:43:02 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-28 10:43:02 -0400
commit3d2378f1020060a84ab0b9ae23507077b7a0e7c1 (patch)
tree448bc57cf16514ef602602feff45ec4583d18608 /.hgignore
parentf094d4f7529c27233f5ca228bda21deb9b864f1a (diff)
parentebb55355ebbe6ec6760d8683e461903957ed24e5 (diff)
merge from viewer-pre-release
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index bd4f19a91e..e3ad4fe7b2 100644
--- a/.hgignore
+++ b/.hgignore
@@ -33,6 +33,7 @@ indra/newview/character
indra/newview/fmod.dll
indra/newview/mozilla-theme
indra/newview/mozilla-universal-darwin.tgz
+indra/newview/res/ll_icon.*
indra/newview/res-sdl
indra/newview/vivox-runtime
indra/server-linux-*