summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorNat Goodspeed <nat@lindenlab.com>2017-04-21 16:43:56 -0400
committerNat Goodspeed <nat@lindenlab.com>2017-04-21 16:43:56 -0400
commit5f6bcaf456469f07d23a5599a1fed59420fd6ae7 (patch)
treeaff6d5b13b69121919433f80103e0594b3525c9d /.hgignore
parentf62b5503285d828813d87779fa0658ee5f122ac5 (diff)
parent7a6a2db289581e43c509ca7dfff7d9b72897a10e (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