diff options
| author | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-30 00:25:16 +0300 |
|---|---|---|
| committer | Andrey Lihatskiy <alihatskiy@productengine.com> | 2023-03-30 00:25:16 +0300 |
| commit | 5217e6bfb77d8f6e0d955415e9d0edea964908e8 (patch) | |
| tree | 33b7436bd46a0807bcf21f3b97a3dc9af9849aa7 /.gitignore | |
| parent | f6ba8306f0210289f12ccbfde3c43eb4dc3feaed (diff) | |
| parent | c7053a6928fd5eafdc935453742e92951ae4e0c1 (diff) | |
Merge branch 'main' into DRTVWR-577-maint-S
# Conflicts:
# indra/cmake/CMakeLists.txt
# indra/newview/skins/default/xui/es/floater_tools.xml
Diffstat (limited to '.gitignore')
| -rwxr-xr-x | .gitignore | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.gitignore b/.gitignore index 839d14bc0d..80eca667df 100755 --- a/.gitignore +++ b/.gitignore @@ -20,11 +20,8 @@ indra/.distcc build-vc80/ build-vc100/ build-vc120/ -build-vc120-32/ -build-vc120-64/ -build-vc150-32/ -build-vc150-64/ -build-vc160-64/ +build-vc*-32/ +build-vc*-64/ indra/CMakeFiles indra/build-vc[0-9]* indra/lib/mono/1.0/*.dll |