Skip to content

Commit 8993ee6

Browse files
committed
Merge branch 'develop'
2 parents bcd869f + 6b3552e commit 8993ee6

567 files changed

Lines changed: 103804 additions & 7440 deletions

File tree

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: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -161,3 +161,10 @@ Assets/StreamingAssets/catalog.bin
161161
Assets/Resources/PerformanceTestRunInfo.json.meta
162162
Assets/Resources/PerformanceTestRunInfo.json
163163
Assets/CleanFlatUI/*
164+
Assets/CleanFlatUI.zip
165+
166+
Assets/Unisave/Resources/UnisavePreferencesFile.asset
167+
168+
Assets/Unisave/Resources/UnisavePreferencesFile.asset.meta
169+
170+
Assets/Resources.meta

.gitmodules

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

.idea/.idea.Pinpoint/.idea/vcs.xml

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

0 commit comments

Comments
 (0)