summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2016-11-23 12:09:40 -0500
committerNat Goodspeed <nat@lindenlab.com>2016-11-23 12:09:40 -0500
commitaadeec30eda65319ecb8d97f7239853b9b072c74 (patch)
tree542f6cb08a640883dbe4a78e3fae7cf6de84ba8f /.hgignore
parent3cffbd0330094cc4c3b42ca5da43cd3b769f123a (diff)
parentfc4564c415a45001cf2e35776df2be2196af26e0 (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer64
Diffstat (limited to '.hgignore')
-rwxr-xr-x.hgignore3
1 files changed, 2 insertions, 1 deletions
diff --git a/.hgignore b/.hgignore
index 09031ac0fa..0d672e6ebc 100755
--- a/.hgignore
+++ b/.hgignore
@@ -17,7 +17,8 @@ build-darwin-*
build-vc80/
build-vc100/
build-vc120/
-build-vc120_x64/
+build-vc120-32/
+build-vc120-64/
indra/build-vc[0-9]*
indra/CMakeFiles
indra/lib/mono/1.0/*.dll