summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-03-03 07:20:04 -0500
committerOz Linden <oz@lindenlab.com>2011-03-03 07:20:04 -0500
commit64c07135bab95b5425ddff69351f0c86301def97 (patch)
treeff3ed9375340cebcfa34904e5a9a2ee3ba105ee1 /.hgignore
parentaa72b0df03c1dfea7571eae4abed30ce9f269158 (diff)
parent7f00a037ee61de0573f00b33ab637794387b2b64 (diff)
merge up from viewer-development
Diffstat (limited to '.hgignore')
-rw-r--r--.hgignore4
1 files changed, 3 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index 1221b80357..e10049c68c 100644
--- a/.hgignore
+++ b/.hgignore
@@ -11,7 +11,9 @@ syntax: glob
*.DS_Store
LICENSES
indra/.distcc
-indra/build-darwin-*
+build-linux-*
+build-darwin-*
+build-vc80/
indra/build-vc[0-9]*
indra/CMakeFiles
indra/lib/mono/1.0/*.dll