Skip to content

Commit 70cd974

Browse files
tomkailtomkail
committed
Merge branch 'master' of https://github.com/tomkail/UnityX
# Conflicts: # Assets/UnityX/Scripts/Components/UI/SLayout/Extensions/SLayout+Shapes.cs # Assets/UnityX/Scripts/Components/UI/Swipe View UI/Editor/SwipeViewEditor.cs # Assets/UnityX/Scripts/Components/UI/WorldSpaceUIElement/WorldSpaceUIElement.cs # Assets/UnityX/Scripts/Extensions/Geometry/Polygon/Polygon.cs # Assets/UnityX/Scripts/Extensions/Spring/Editor/SpringHandlerPropertyDrawer.cs # Assets/UnityX/Scripts/Extensions/UnityEngineX/ComponentMenuX.cs
2 parents 31cd604 + 53f23e4 commit 70cd974

File tree

0 file changed

+0
-0
lines changed

    0 file changed

    +0
    -0
    lines changed

    0 commit comments

    Comments
     (0)