summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2011-02-23 15:56:28 -0500
committerOz Linden <oz@lindenlab.com>2011-02-23 15:56:28 -0500
commitb246fdd74827caa7927c0aee64397a764db58df2 (patch)
treebd76f7ca0d164a219547725d41ce2bd01b5637d6 /.hgignore
parent609c70eb5a48389bef1ad33358774764ee9615e2 (diff)
parent0a262969e1da82fc95ec889f7aaafa4078bcf480 (diff)
Automated merge with ssh://hg@bitbucket.org/lindenlab/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