summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorsimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-08-01 14:07:24 -0700
committersimon@Simon-PC.lindenlab.com <simon@Simon-PC.lindenlab.com>2012-08-01 14:07:24 -0700
commitb7555a3309bda8e9689627901051aa90fcb7be34 (patch)
treebbb84478c302539f434bab7a620fe23456926236 /.hgignore
parent62379fd7628afa5ce1b104ff66b26821ce740c29 (diff)
parent92a0db2a4f5397067e087068f736181e618e9c0a (diff)
Merge back viewer-lion, which has viewer-development and down-stream fixes
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 501f9e6abe..b367090227 100644
--- a/.hgignore
+++ b/.hgignore
@@ -25,6 +25,7 @@ indra/lib/mono/indra/*.exe
indra/lib/mono/indra/*.pdb
indra/lib/python/eventlet/
indra/llwindow/glh/glh_linear.h
+indra/newview/app_settings/dictionaries
indra/newview/app_settings/mozilla
indra/newview/app_settings/mozilla-runtime-*
indra/newview/app_settings/mozilla_debug