summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2013-10-03 18:04:27 -0400
committerOz Linden <oz@lindenlab.com>2013-10-03 18:04:27 -0400
commit4dccf30bf318649c7b371355fd34cde6c143e867 (patch)
tree4acbdefe0bb187a817583e835112f4317e11d596 /.hgignore
parentbd18f3c097304504c398df02613229a64f7eac81 (diff)
parentf7158bc5afcec1da8b9d2d5a4ed86921e62d4959 (diff)
merge changes for 3.6.7-release
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.*