summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-03-13 16:38:00 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-03-13 16:38:00 -0400
commit66de0c9965ff68bcb8cb60975fcffa45e2c6d74c (patch)
treee3fa6c87fe70e487b6fc6e94f6793b7638b568ea /.hgignore
parent49e114748fdb52599aaa141c2006198c48aa083b (diff)
parent17c8eadb3d89bc78019f0b50eb8b109f25616781 (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