helar/Heroes_of_Hiis
1
0
Fork 0
Code Issues 8 Pull Requests 2 Projects Releases Wiki Activity

merge door to staging

Browse Source
This commit is contained in:
HelarJ
2022-03-28 16:54:50 +03:00
parent 99d412b258 fb14e165d4
commit 53bd10a13c
1331 changed files with 410263 additions and 5190 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
View File

@@ -1,7 +1,11 @@
fileFormatVersion: 2
<<<<<<<< HEAD:Assets/QuickOutline/Samples/Scenes/QuickOutline.unity.meta
guid: f23712c79adc910408e872b127e825cf
timeCreated: 1522615825
licenseType: Store
========
guid: 3e003a7052336a84388878dca47c8528
>>>>>>>> origin/DoorInteration:Assets/LowPolyDungeons/Scenes/LowPolyDungeons_Demo.unity.meta
DefaultImporter:
externalObjects: {}
userData: