summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-02-03 09:54:52 -0500
committerNat Goodspeed <nat@lindenlab.com>2017-02-03 09:54:52 -0500
commit434f0e161aa7b378ff16d526e104e580ba367ab2 (patch)
treea7eed0bd6d7278fa63c362fb7ddb4789d7408705 /.hgignore
parent080744d8990e6b18a80858803a20a5ec87020d82 (diff)
parentf40bd0fac308b21319d84ee221cb8f81d369dd71 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-release
Diffstat (limited to '.hgignore')
-rwxr-xr-x.hgignore2
1 files changed, 2 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index 1b7a9019a2..0d672e6ebc 100755
--- a/.hgignore
+++ b/.hgignore
@@ -17,6 +17,8 @@ build-darwin-*
build-vc80/
build-vc100/
build-vc120/
+build-vc120-32/
+build-vc120-64/
indra/build-vc[0-9]*
indra/CMakeFiles
indra/lib/mono/1.0/*.dll