Ansariel 39a6735fc9 Merge branch 'main' of https://github.com/secondlife/viewer ... # Conflicts: # .gitignore # autobuild.xml # indra/cmake/APR.cmake # indra/newview/CMakeLists.txt # indra/newview/installers/windows/installer_template.nsi # indra/newview/viewer_manifest.py # indra/test/namedtempfile.h		2023-10-26 15:49:12 +02:00
..
ipc	SL-15742: Convert build scripts to Python 3	2021-12-10 14:42:49 -08:00
util	Merge branch 'main' of https://github.com/secondlife/viewer	2023-10-26 15:49:12 +02:00
__init__.py	MAINT-6585: put back indra/ipc files needed for scripts/template_verifier.py	2016-07-21 16:51:47 -07:00