Ansariel 4444bc8a27 Merge branch 'develop' of https://github.com/secondlife/viewer ... # Conflicts: # indra/tools/vstool/VSTool.csproj # indra/tools/vstool/VSTool.exe # indra/tools/vstool/VSTool.sln # indra/tools/vstool/main.cs		2025-08-16 12:38:56 +02:00
..
manifests	Now let's see what Git is complaining in VS...	2020-01-16 01:24:05 +01:00