summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2012-04-17 13:47:31 -0700
committerOz Linden <oz@lindenlab.com>2012-04-17 13:47:31 -0700
commit19e0cc93a8af661dbac47552474a704ade600c74 (patch)
tree5d7e539a4c98607a189c6e472732b75608379abb /.hgignore
parentee1124e1c02b1a8be0cc8d2cbce1083dca3b40a2 (diff)
parent3ccda1f2855ae9e5b3f519236e9b4f233d542d1a (diff)
DRTVWR-139: merge back 3.3.1-beta2 fixes
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