summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDebi King (Dessie) <dessie@lindenlab.com>2011-08-22 17:18:34 -0400
committerDebi King (Dessie) <dessie@lindenlab.com>2011-08-22 17:18:34 -0400
commit015cf59c96a4613996fc34b898fe9751f27f9c8c (patch)
tree412a776e4bb8ae72960ea02d40ea7c98be1c1065 /.hgignore
parentf99cf295e1d7e297996d4ea32a2202273010d8a3 (diff)
parentb73291e9bd6a706c5c8913f1c40bd8324f772c4a (diff)
merged .hgtags
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-*