summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2014-12-04 15:57:27 -0500
committerNat Goodspeed <nat@lindenlab.com>2014-12-04 15:57:27 -0500
commitab0ab0307a5877505863efefbcc80f5458c9eefe (patch)
tree90e065a3fda6e7edf8650764ea7ec4fa5557c93b
parentf861e670e37e8471f699bc67751533d67e847c4b (diff)
parente2e97d4e7d475f8c1f55d1119c2588f0e614e5e0 (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