Skip to content

Commit 0b3c400

Browse files
committed
Merge branch 'develop'
2 parents a94b750 + 9d895be commit 0b3c400

File tree

61 files changed

+9280
-1180
lines changed

Some content is hidden

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

61 files changed

+9280
-1180
lines changed

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -156,3 +156,7 @@ UserSettings/Layouts/*
156156
UserSettings/
157157
Assets/AddressableAssetsData/link.xml
158158
Assets/AddressableAssetsData/link.xml.meta
159+
Assets/StreamingAssets/catalog.bin.meta
160+
Assets/StreamingAssets/catalog.bin
161+
Assets/Resources/PerformanceTestRunInfo.json.meta
162+
Assets/Resources/PerformanceTestRunInfo.json

0 commit comments

Comments
 (0)