summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorJJ Linden <jj@lindenlab.com>2013-10-10 16:44:22 -0700
committerJJ Linden <jj@lindenlab.com>2013-10-10 16:44:22 -0700
commitdc431ea6d2e4e13ab505b8118d6f9220630efe96 (patch)
tree8c37de1ca61cf29e3d1863ce08d34acff666e9ab /.hgignore
parent3aea5a5a6ab0e6d96fe581a9bab9896956129ba3 (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
merged in recent changes
Diffstat (limited to '.hgignore')
-rwxr-xr-x.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index c845758e7c..a8a244596d 100755
--- a/.hgignore
+++ b/.hgignore
@@ -33,6 +33,7 @@ indra/newview/app_settings/static_*.db2
indra/newview/browser_profile
indra/newview/character
indra/newview/fmod.dll
+indra/newview/fmod.log
indra/newview/mozilla-theme
indra/newview/mozilla-universal-darwin.tgz
indra/newview/res/ll_icon.*