Skip to content

S
SSBookMinigames
Switch branch/tag
History Find file
  • 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
Name
Last commit
 Last update
..
Fonts & Materials Loading commit data...
Sprite Assets Loading commit data...
Style Sheets Loading commit data...
Fonts & Materials.meta Loading commit data...
LineBreaking Following Characters.txt Loading commit data...
LineBreaking Following Characters.txt.meta Loading commit data...
LineBreaking Leading Characters.txt Loading commit data...
LineBreaking Leading Characters.txt.meta Loading commit data...
Sprite Assets.meta Loading commit data...
Style Sheets.meta Loading commit data...
TMP Settings.asset Loading commit data...
TMP Settings.asset.meta Loading commit data...