Andrey Lihatskiy 97f09de4fc Merge branch 'master' into DRTVWR-520-apple-notarization ... # Conflicts: # autobuild.xml # build.sh # indra/CMakeLists.txt # indra/newview/CMakeLists.txt # indra/newview/llappviewermacosx.cpp # indra/newview/llappviewerwin32.h # indra/newview/viewer_manifest.py # indra/win_crash_logger/llcrashloggerwindows.cpp		2021-08-12 23:13:12 +03:00
..
base	remove only-partially-successful attempt to put teamcity blocks around targets	2018-09-07 09:13:57 -04:00
cef	Merge with Master after Viewer Release (also fixed some glaring automerge screw ups)	2021-07-19 17:43:19 -07:00
example	SL-3704 Plugin exit issues	2019-07-01 17:28:58 +03:00
gstreamer010	remove only-partially-successful attempt to put teamcity blocks around targets	2018-09-07 09:13:57 -04:00
libvlc	SL-14044 Windows build fix	2020-10-01 08:44:30 +03:00
CMakeLists.txt	…