summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-08-08 09:14:36 -0400
committerOz Linden <oz@lindenlab.com>2011-08-08 09:14:36 -0400
commit0d085e90ac5cd0ede13a0e16b7cf137732c04acc (patch)
tree77ca30a4c5c70a1cd667a6b604a3b5e3b035d738 /.hgignore
parent24f88cfe194484a6cf27e27bd60d3ad198abba32 (diff)
parentd456006f9a7034463e3448cf6ea3b90a304471b7 (diff)
merge changes for storm-1060
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-*