930c834a4b
# Conflicts: # Assets/Sprites/UI.meta # Assets/Sprites/UI/UIBase.aseprite # Assets/Sprites/UI/UIBase.png # Assets/Sprites/UI/UIButtonBase.aseprite # Assets/Sprites/UI/UIButtonBase1.png # Assets/Sprites/UI/UIButtonBase2.png # Assets/Sprites/UI/UIButtonBase3.png # Assets/Sprites/UI/UIButtonBase4.png |
||
---|---|---|
.. | ||
UIBase.aseprite.meta | ||
UIBase.png.meta | ||
UIButtonBase.aseprite.meta | ||
UIButtonBase1.png.meta | ||
UIButtonBase2.png.meta | ||
UIButtonBase3.png.meta | ||
UIButtonBase4.png.meta |