summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorMark Palange (Mani) <palange@lindenlab.com>2010-06-07 13:16:39 -0700
committerMark Palange (Mani) <palange@lindenlab.com>2010-06-07 13:16:39 -0700
commit09e1f88cc6a7dc0f52ad9d620a27cd54b4af021c (patch)
treeaf6fb655a9dff65772855d1bf9d67b1f6acb0f01 /.hgignore
parent71f39136795609700a6eb46aad7b0f1397a860d0 (diff)
parent474832b084891df42d731e6d48770b9e969d7b2a (diff)
Automated merge with ssh://hg.lindenlab.com/palange/viewer-2-0
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 53ddf71bb7..1221b80357 100644
--- a/.hgignore
+++ b/.hgignore
@@ -60,3 +60,4 @@ glob:indra/newview/teleport_history.txt
glob:indra/newview/search_history.txt
glob:indra/newview/filters.xml
glob:indra/newview/avatar_icons_cache.txt
+glob:indra/newview/avatar_lad.log