• saad's avatar
    Merge branch 'CS-2D' into pt_TF · f5328474
    saad authored
    # Conflicts:
    #	My project/Assets/EKstudio/LowPoly Factory Machine Pack Demo/Setup_Scene_Built-in.unitypackage.meta
    #	My project/Assets/EKstudio/LowPoly Factory Machine Pack Demo/Setup_Scene_URP.unitypackage.meta
    #	My project/Assets/FlatKit/[Render Pipeline] Built-In.unitypackage.meta
    #	My project/Assets/FlatKit/[Render Pipeline] Universal (URP).unitypackage.meta
    #	My project/Assets/GUI PRO Kit - Simple Casual/Sprite/Component/Icon_ItemIcons_(x2)/ItemIcons_(x2).unitypackage.meta
    #	My project/Assets/GUI PRO Kit - Simple Casual/Sprite/Component/Icon_PictoIcons_(x2)/PictoIcons_(x2).unitypackage.meta
    #	My project/Assets/TextMesh Pro/Shaders/TMP_SDF-Mobile.shader
    #	My project/Assets/TextMesh Pro/Shaders/TMPro_Properties.cginc
    #	My project/UserSettings/EditorUserSettings.asset
    #	My project/UserSettings/Layouts/CurrentMaximizeLayout.dwlt
    f5328474
Hakawaty.asset 3.48 MB
The source could not be displayed because it is larger than 1 MB. You can load it anyway or download it instead.