Merge conflict patch and map texture update

Browse Source

...

This commit is contained in:

trubkokrtek

2026-05-17 22:50:01 +02:00

parent 843c121666

commit c2566b8db0

13 changed files with 517 additions and 1237 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

399

Assets/TextMesh Pro/Resources/Fonts & Materials/LiberationSans SDF.asset

File diff suppressed because one or more lines are too long