summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authordolphin <dolphin@lindenlab.com>2013-10-04 09:19:25 -0700
committerdolphin <dolphin@lindenlab.com>2013-10-04 09:19:25 -0700
commitc2c060d4401d3a79a9ae0076af0c9b86d14f7f37 (patch)
treeb7efcf3c2e38aa9de488342b3379b4bde0a6bc47 /.hgignore
parentd44c85c6dc575c0c67019ce1bffecfaa5bc275d1 (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
Merge with 3.6.7
Diffstat (limited to '.hgignore')
-rwxr-xr-x.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index c4e4d0921a..3aeca5587b 100755
--- a/.hgignore
+++ b/.hgignore
@@ -32,6 +32,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.*