Skip to content

Commit 07666d4

Browse files
kirevdokimovkirevdokimov
committed
Merge branch 'sdf'
2 parents 518f728 + d78965f commit 07666d4

59 files changed

Lines changed: 539 additions & 1663 deletions

Some content is hidden

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

‎.gitignore‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,3 +51,6 @@ sysinfo.txt
5151

5252
# Crashlytics generated file
5353
crashlytics-build.properties
54+
55+
Assets/Plugins*
56+
Assets/UiRoundedCorners/README.md.meta

‎Assets/UiRoundedCorners/README.md‎

Lines changed: 0 additions & 14 deletions
This file was deleted.

‎Assets/UiRoundedCorners/RoundedCorners.cginc‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

‎Assets/UiRoundedCorners/RoundedCorners.cginc.meta‎

Lines changed: 0 additions & 9 deletions
This file was deleted.

Assets/Examples.meta renamed to Examples.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Examples/ButtonMaterial1.mat renamed to Examples/ButtonMaterial1.mat

File renamed without changes.

Assets/Examples/ButtonMaterial1.mat.meta renamed to Examples/ButtonMaterial1.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Examples/ButtonMaterial2.mat renamed to Examples/ButtonMaterial2.mat

File renamed without changes.

Assets/Examples/ButtonMaterial2.mat.meta renamed to Examples/ButtonMaterial2.mat.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Examples/Lenna.png renamed to Examples/Lenna.png

File renamed without changes.

0 commit comments

Comments
 (0)