mafiesto4
|
9c7b66ba70
|
Merge branch 'local' of git://github.com/honzapatCZ/FlaxEngine into honzapatCZ-local
# Conflicts:
# Source/Editor/Windows/Assets/LocalizedStringTableWindow.cs
# Source/Engine/Localization/Localization.cpp
# Source/Engine/Localization/LocalizedStringTable.h
|
2021-12-09 11:31:06 +01:00 |
|