diff options
author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-21 11:30:48 +0300 |
---|---|---|
committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-07-21 11:30:48 +0300 |
commit | f77a30f740b233a0941ff0b78558712ea796c51d (patch) | |
tree | 0a997a539bdebbf5d1ed646a6e42b29fbb43d64d /.gitignore | |
parent | 383352c61c5e20bdd7fe4be31bc227cfb62c4bc6 (diff) | |
parent | 72423372d6cd7f763a5567ad75752fa4e7131d60 (diff) |
Merge branch 'master' into DRTVWR-507-maint
# Conflicts:
# autobuild.xml
Diffstat (limited to '.gitignore')
-rwxr-xr-x | .gitignore | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore index a73a85e84f..4af34870cf 100755 --- a/.gitignore +++ b/.gitignore @@ -13,14 +13,17 @@ LICENSES build-darwin-* build-linux-* -build-stamp -build-vc120* -build-vc150* -configure-stamp debian/files debian/secondlife-appearance-utility* debian/secondlife-viewer* indra/.distcc +build-vc80/ +build-vc100/ +build-vc120/ +build-vc120-32/ +build-vc120-64/ +build-vc150-32/ +build-vc150-64/ indra/CMakeFiles indra/build-vc[0-9]* indra/lib/mono/1.0/*.dll |