summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2018-01-17 12:43:28 -0500
committerOz Linden <oz@lindenlab.com>2018-01-17 12:43:28 -0500
commitd7c8678c3aa46aed09dce6c1edfc196e72d4b428 (patch)
tree538a1ef15c2e28676f6a7618bc1e0b5749e2bcea /.hgignore
parent9e4b977b2fbb565cef88f3d72e07dbdf8cb2cd69 (diff)
parent7acbd8ed8d73c507675d45360df07d232c431a8b (diff)
merge 5.1.0-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