summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorLeslie Linden <leslie@lindenlab.com>2011-11-14 11:29:02 -0800
committerLeslie Linden <leslie@lindenlab.com>2011-11-14 11:29:02 -0800
commit2f55effd25c035c2af80bd5e6754c96a18f9d7e0 (patch)
tree02d2c153b4e40b9770521ee64fb45fd7176b082c /.hgignore
parent7a31a48536f8a373b4e857ca8b906a6984530a04 (diff)
parentd8e1b48328017eba1c68bcc56a4f67085643988a (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