Skip to content

Commit dbc0f1d

Browse files
committed
Merge branch 'release/0.3.0-alpha'
2 parents 2e289af + 7b5f3c9 commit dbc0f1d

File tree

188 files changed

+35438
-8924
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

188 files changed

+35438
-8924
lines changed

.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,6 @@ sysinfo.txt
2929
*.apk
3030
!anima_v*.apk
3131
*.unitypackage
32+
33+
# Merge
34+
*.orig

Assets/PS_Materials.meta renamed to Assets/Animations.meta

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)