summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorGraham Linden <graham@lindenlab.com>2013-09-26 11:44:40 -0700
committerGraham Linden <graham@lindenlab.com>2013-09-26 11:44:40 -0700
commit0103cac1ddda96fd470238d2c8b73c2cf55b6c12 (patch)
treea485d28fd9861c41bf9b7117c085bd84617f43de /.hgignore
parentdd4beb695a9c800b37b7c9a19d3ac3f4456012f5 (diff)
parentbadb8a945d31aed6f396e7efb521e76083870069 (diff)
Merge viewer-bear maint RC changes to get this build closer to the RC it will follow
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.*