 Залетов Федор
|
ac1950d901
|
Merge branch 'master' of https://git.bit5.ru/zaletovfyodor/PO
# Conflicts:
# Library/ArtifactDB
# Library/CurrentLayout-default.dwlt
# Library/SceneVisibilityState.asset
# Library/ScriptAssemblies/Assembly-CSharp.dll
# Library/ScriptAssemblies/Assembly-CSharp.pdb
# Library/SourceAssetDB
# Logs/AssetImportWorker0-prev.log
# Logs/AssetImportWorker0.log
# Logs/shadercompiler-UnityShaderCompiler.exe10.log
# Logs/shadercompiler-UnityShaderCompiler.exe11.log
# Logs/shadercompiler-UnityShaderCompiler.exe3.log
# Logs/shadercompiler-UnityShaderCompiler.exe5.log
# Logs/shadercompiler-UnityShaderCompiler.exe7.log
# Logs/shadercompiler-UnityShaderCompiler.exe8.log
# Logs/shadercompiler-UnityShaderCompiler.exe9.log
# obj/Debug/Assembly-CSharp.csproj.AssemblyReference.cache
# obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
|
2022-01-19 23:49:46 +03:00 |