diff options
author | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
---|---|---|
committer | Oz Linden <oz@lindenlab.com> | 2014-12-17 14:28:58 -0500 |
commit | 4666497507b2489004a4ebcf77c0e33723291bcd (patch) | |
tree | 677050cb13533b17e2c5e170a8438aef221b85ca /.hgignore | |
parent | 11ecd9a2d97f2daeba932bcda557d3ae17956ed8 (diff) | |
parent | f8ed44f8ec80916e684c2783da02f89474710de6 (diff) |
merge up to latest changes from callum and nat
Diffstat (limited to '.hgignore')
-rwxr-xr-x | .hgignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -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 |