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
..
3d_objects _free	City	2024-09-11 18:46:05 +02:00
FBX	City	2024-09-11 18:46:05 +02:00
KayKit_Adventurers_1.0_FREE	City	2024-09-11 18:46:05 +02:00
KayKit_DungeonRemastered_1.1_FREE	City	2024-09-11 18:46:05 +02:00
Low Poly Water	City	2024-09-11 18:46:05 +02:00
LowPolyWater_Pack	City	2024-09-11 18:46:05 +02:00
Models	City	2024-09-11 18:46:05 +02:00
Proxy Games	mergeable	2024-09-18 00:29:20 +02:00
Scenes	City	2024-09-11 18:46:05 +02:00
scripts	City	2024-09-11 18:46:05 +02:00
3d_objects _free.meta	City	2024-09-11 18:46:05 +02:00
FBX.meta	City	2024-09-11 18:46:05 +02:00
grass.mat	City	2024-09-11 18:46:05 +02:00
grass.mat.meta	City	2024-09-11 18:46:05 +02:00
KayKit_Adventurers_1.0_FREE.meta	City	2024-09-11 18:46:05 +02:00
KayKit_DungeonRemastered_1.1_FREE.meta	City	2024-09-11 18:46:05 +02:00
Low Poly Water.meta	City	2024-09-11 18:46:05 +02:00
LowPolyWater_Pack.meta	City	2024-09-11 18:46:05 +02:00
Models.meta	City	2024-09-11 18:46:05 +02:00
New Terrain 1.asset	Merge branch 'miasto'	2024-09-18 00:36:35 +02:00
New Terrain 1.asset.meta	City	2024-09-11 18:46:05 +02:00
New Terrain.asset	City	2024-09-11 18:46:05 +02:00
New Terrain.asset.meta	City	2024-09-11 18:46:05 +02:00
Proxy Games.meta	City	2024-09-11 18:46:05 +02:00
Scenes.meta	City	2024-09-11 18:46:05 +02:00
scripts.meta	City	2024-09-11 18:46:05 +02:00