summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-31 16:26:09 -0400
committerBrad Payne (Vir Linden) <vir@lindenlab.com>2011-10-31 16:26:09 -0400
commit09179d1346ccf2fa07b2dec6a72592beb3bd262f (patch)
tree86b28bc6c0322a9abe9721dd0a0aa6e104487926 /.hgignore
parent0f9dc968cfb702eba595213bbecd34375bd048c5 (diff)
parentf18cfe97750cc13374adab15636532fe0fbda19c (diff)
merge viewer-development to mesh-development
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