summaryrefslogtreecommitdiff
path: root/.hgignore
diff options
context:
space:
mode:
authorOz Linden <oz@lindenlab.com>2014-12-17 14:28:58 -0500
committerOz Linden <oz@lindenlab.com>2014-12-17 14:28:58 -0500
commit4666497507b2489004a4ebcf77c0e33723291bcd (patch)
tree677050cb13533b17e2c5e170a8438aef221b85ca /.hgignore
parent11ecd9a2d97f2daeba932bcda557d3ae17956ed8 (diff)
parentf8ed44f8ec80916e684c2783da02f89474710de6 (diff)
merge up to latest changes from callum and nat
Diffstat (limited to '.hgignore')
-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