diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-11 01:34:13 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2020-08-11 01:34:13 +0300 |
| commit | 9406b757a36d409e93a0ccde0a1fea289a3e6118 (patch) | |
| tree | bac8ea172ccf40ea836d1b750d73e5d2cc5e11e4 /.gitignore | |
| parent | f554fe2ca74ddf275e47cdce8537e04ab40f9f95 (diff) | |
| parent | 2e66c406d1767f26f968452e9ca5f5c0afa513b2 (diff) | |
Merge branch 'DRTVWR-501-maint' into DRTVWR-503-maint
# Conflicts:
# indra/cmake/DirectX.cmake
# indra/newview/llviewerparcelmedia.cpp
# indra/newview/viewer_manifest.py
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 |