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
..
Fonts & Materials	bank	2024-09-11 18:59:01 +02:00
Sprite Assets	bank	2024-09-11 18:59:01 +02:00
Style Sheets	bank	2024-09-11 18:59:01 +02:00
Fonts & Materials.meta	bank	2024-09-11 18:59:01 +02:00
LineBreaking Following Characters.txt	bank	2024-09-11 18:59:01 +02:00
LineBreaking Following Characters.txt.meta	bank	2024-09-11 18:59:01 +02:00
LineBreaking Leading Characters.txt	bank	2024-09-11 18:59:01 +02:00
LineBreaking Leading Characters.txt.meta	bank	2024-09-11 18:59:01 +02:00
Sprite Assets.meta	bank	2024-09-11 18:59:01 +02:00
Style Sheets.meta	bank	2024-09-11 18:59:01 +02:00
TMP Settings.asset	bank	2024-09-11 18:59:01 +02:00
TMP Settings.asset.meta	bank	2024-09-11 18:59:01 +02:00