summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-12-04 21:16:14 -0500
committerNat Goodspeed <nat@lindenlab.com>2014-12-04 21:16:14 -0500
commit8eb5dfbbc4898cd3d054f4aef55fbc39e481383f (patch)
treeff54ad2c374b6c5f1dc82e102fc2102f916e06ab
parent5225444caaa3f3ce77b690e1d112f34bd6ed9f50 (diff)
parentab0ab0307a5877505863efefbcc80f5458c9eefe (diff)
Automated merge with ssh://bitbucket.org/lindenlab/viewer-tools-update
-rwxr-xr-x.hgignore1
1 files changed, 1 insertions, 0 deletions
diff --git a/.hgignore b/.hgignore
index f3fca9bcb2..10549b6144 100755
--- a/.hgignore
+++ b/.hgignore
@@ -17,6 +17,7 @@ build-linux-*
build-darwin-*
build-vc80/
build-vc100/
+build-vc120/
indra/build-vc[0-9]*
indra/CMakeFiles
indra/lib/mono/1.0/*.dll