summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorLoren Shih <seraph@lindenlab.com>2011-04-04 10:42:52 -0400
committerLoren Shih <seraph@lindenlab.com>2011-04-04 10:42:52 -0400
commit47781184fc50f6e9e0842c2d7fa7632038a279df (patch)
tree83522faadf17895565c38d89064aff6da51a1006 /.hgignore
parent0dd0758ab9114c53a274ff707d626c8fe5e7afb0 (diff)
parent3c6a09372da395a621fb35db4934af2c7c21e910 (diff)
Automated merge up from viewer-development into mesh-development
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index dd878b0c16..bd4f19a91e 100644
--- a/.hgignore
+++ b/.hgignore
@@ -12,7 +12,10 @@ syntax: glob
*.orig
LICENSES
indra/.distcc
-indra/build-darwin-*
+build-linux-*
+build-darwin-*
+build-vc80/
+build-vc100/
indra/build-vc[0-9]*
indra/CMakeFiles
indra/lib/mono/1.0/*.dll