Merge branch 'feature-text' into develop

Browse Source

...

This commit is contained in:

Andrew Cassidy

2020-09-27 17:57:02 -07:00

parent b630ddce5e 13bf70fd8a

commit 9f32a42e51

66 changed files with 15911 additions and 82 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

BIN

GameData/ConformalDecals/Plugins/ConformalDecals.dll

Binary file not shown.