summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBryan O'Sullivan <bos@lindenlab.com>2009-06-25 11:19:31 -0700
committerBryan O'Sullivan <bos@lindenlab.com>2009-06-25 11:19:31 -0700
commitb74af1c2aa4d8804a240135f54df7d3c21ce3ab6 (patch)
tree1bcce9d6aacdf73d2f31edbe33791b1b7b622d5c
parent7aec119d84aabbf5fd156e9739984eb767ab262f (diff)
parent9c394b3aaecacc9a70354c544bd728a4f4f966d2 (diff)
Merge with trunk
-rw-r--r--.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 38ff57725e..61c38705f4 100644
--- a/.hgignore
+++ b/.hgignore
@@ -4,6 +4,7 @@ syntax: glob
*~
.*.swp
LICENSES
+indra/.distcc
indra/build-darwin-*
indra/build-vc[0-9]*
indra/lib/mono/1.0/*.dll