summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-12-05 17:01:38 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-12-05 17:01:38 -0500
commit05d58c91ef55fd90ea2f3e0f1a1199ac5e690b30 (patch)
tree70ae80b97c738ceee3b4ba530454e97a8698b6cb /.hgignore
parent68413474c4479eee9bdbeb34ea131475ba1d646e (diff)
parent4ca084f7a06acc4ef861c1f4df2f857f8836b85e (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