summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
committerOz Linden <oz@lindenlab.com>2012-05-26 17:06:07 -0400
commita4913246770b58ed569021c484c213231aaae549 (patch)
tree0878deeaa86b2c3a28cbf325566e8489111523c1 /.hgignore
parent80c2abddcfbcb578e70d220baa95aebdee3d529c (diff)
parentb2b446aed7f7f32151bc152ba25d44253ebf864f (diff)
merge up to latest viewer-release
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 403b73df6d..bc3020eee4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -67,3 +67,4 @@ glob:indra/newview/filters.xml
glob:indra/newview/avatar_icons_cache.txt
glob:indra/newview/avatar_lad.log
glob:*.diff
+*.rej