HelarJ
|
c085a629af
|
Merge remote-tracking branch 'origin/gesture_joonasp'
# Conflicts:
# Assets/_TerrainData/TerrainData_521113671563848736.asset
# Assets/_TerrainData/TerrainData_699485723238748736.asset
# Assets/_TerrainData/TerrainData_869121471408748736.asset
# Assets/_TerrainData/TerrainMaterial_521113671563848736.mat
# Assets/_TerrainData/TerrainMaterial_699485723238748736.mat
# Assets/_TerrainData/TerrainMaterial_869121471408748736.mat
# ProjectSettings/EditorBuildSettings.asset
|
2022-04-25 16:17:38 +03:00 |