Nukie
|
78abb88a17
|
Merge branch 'miasto'
# Conflicts:
# Assets/Miasto_kapi/Scenes/SampleScene.unity.meta
# Assets/Scenes/SampleScene.unity
# Assets/Scenes/SampleScene.unity.meta
# Assets/Scenes/bank.unity
# Assets/Scenes/bank.unity.meta
# Assets/Scenes/miasto kapi merge.unity
# Assets/TextMesh Pro.meta
# Assets/TextMesh Pro/Examples & Extras.meta
# Assets/TextMesh Pro/Examples & Extras/Prefabs.meta
# Assets/TextMesh Pro/Examples & Extras/Prefabs/Text Popup.prefab
# Assets/TextMesh Pro/Examples & Extras/Scripts.meta
# Assets/TextMesh Pro/Fonts.meta
# Assets/TextMesh Pro/Resources.meta
# Assets/TextMesh Pro/Resources/Fonts & Materials.meta
# Assets/TextMesh Pro/Shaders.meta
|
2024-09-18 00:36:35 +02:00 |
|