summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorDave Parks <davep@lindenlab.com>2013-06-21 12:51:29 -0500
committerDave Parks <davep@lindenlab.com>2013-06-21 12:51:29 -0500
commit79029149a415a9f32e08d378653199a880d21e65 (patch)
tree14b6f7d59c66602affd77b6e21f1981b28995fa8 /.hgignore
parent80552a465e9169b7326c346f4685790ea459823a (diff)
parent8511385a5407181ced7bb226d4054185c597d05e (diff)
Automated merge with file:///F:%5Cviewer-bear
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.*