summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-14 14:44:13 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-14 14:44:13 -0800
commit76caf0238cb98c1abf69d56e122c71a1208b0d72 (patch)
tree4f4a77ff8f11e7cc0a0f7af437b8699f0d035727 /.hgignore
parentb403a9da23a2df73a657bfa835a3706a261af2fb (diff)
parentc24645f7b51ea27e1686bbe72470a9f3c09fc676 (diff)
Merge
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index e3ad4fe7b2..403b73df6d 100644
--- a/.hgignore
+++ b/.hgignore
@@ -66,3 +66,4 @@ glob:indra/newview/search_history.txt
glob:indra/newview/filters.xml
glob:indra/newview/avatar_icons_cache.txt
glob:indra/newview/avatar_lad.log
+glob:*.diff