Skip to content

Commit d8cbba5

Browse files
committed
Merged branch develop into master
2 parents 0659c71 + 4234c83 commit d8cbba5

File tree

84 files changed

+1634
-376
lines changed

Some content is hidden

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

84 files changed

+1634
-376
lines changed

Assets/Devel/Editor/Data/RainbowFoldersSettings.asset

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,3 +176,23 @@ MonoBehaviour:
176176
Key: Assets/Devel/Examples/Colors/12. Magenta
177177
SmallIcon: {fileID: 2800000, guid: f14480b09218f3047a15b5ded872de28, type: 3}
178178
LargeIcon: {fileID: 2800000, guid: 38dec0c9e1ada504d98f8a0f4959a215, type: 3}
179+
- Type: 1
180+
Key: Assets/Devel/Examples/Platforms/Android
181+
SmallIcon: {fileID: 2800000, guid: 6858fce162a9b4744baedb1357e0b690, type: 3}
182+
LargeIcon: {fileID: 2800000, guid: c1e5c2a549b1b8048a04987738bb9c52, type: 3}
183+
- Type: 1
184+
Key: Assets/Devel/Examples/Platforms/iOS
185+
SmallIcon: {fileID: 2800000, guid: 25e93be6802c63c408e62e4bdfa4e91f, type: 3}
186+
LargeIcon: {fileID: 2800000, guid: 6888916ad986e2944a731fd320e5f566, type: 3}
187+
- Type: 1
188+
Key: Assets/Devel/Examples/Platforms/Windows
189+
SmallIcon: {fileID: 2800000, guid: 277aff0709e51d2418b61f0c82cb277f, type: 3}
190+
LargeIcon: {fileID: 2800000, guid: c34025bbb220b844a8e633a414c63632, type: 3}
191+
- Type: 1
192+
Key: Assets/Devel/Examples/Platforms/Mac
193+
SmallIcon: {fileID: 2800000, guid: 54a92a89ce169714a9a00aebb271cdd6, type: 3}
194+
LargeIcon: {fileID: 2800000, guid: 80ea8e29a9c225e4291234d6ba25a868, type: 3}
195+
- Type: 1
196+
Key: Assets/Devel/Examples/Platforms/WebGL
197+
SmallIcon: {fileID: 2800000, guid: b8e8a328d6527a14783473666c1f8a08, type: 3}
198+
LargeIcon: {fileID: 2800000, guid: 010e6d817952d434197d318f48b2f16a, type: 3}

Assets/Devel/Examples/Platforms.meta

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

Assets/Devel/Examples/Platforms/Android.meta

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

Assets/Devel/Examples/Platforms/Android/stub.file

Whitespace-only changes.

Assets/Devel/Examples/Platforms/Android/stub.file.meta

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

Assets/Devel/Examples/Platforms/Mac.meta

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

Assets/Devel/Examples/Platforms/Mac/stub.file

Whitespace-only changes.

Assets/Devel/Examples/Platforms/Mac/stub.file.meta

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

Assets/Devel/Examples/Platforms/WebGL.meta

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

Assets/Devel/Examples/Platforms/WebGL/stub.file

Whitespace-only changes.

0 commit comments

Comments
 (0)