summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorGilbert Gonzales <gilbert@lindenlab.com>2012-08-24 13:57:57 -0700
committerGilbert Gonzales <gilbert@lindenlab.com>2012-08-24 13:57:57 -0700
commit31d69a6bc5a81dc3e844138033e41e339dce3aa1 (patch)
tree39119d49fcbbaf3cf7fda13b7b62970e1a2a5999 /.hgignore
parent6e92b96e88401aaca203b627e84ce311b7f75e4a (diff)
parentb19e6c295972c83a2637a29007bc5d0a92711ea9 (diff)
merging in latest changes
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index b367090227..b180d92003 100644
--- a/.hgignore
+++ b/.hgignore
@@ -36,7 +36,7 @@ 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/res-sdl/ll_icon.*
indra/newview/vivox-runtime
indra/server-linux-*
indra/temp