Skip to content

Commit b8925f9

Browse files
inwoodsinwoods
committed
Merge branch 'master' into Uni-45921-physical-camera
2 parents 9f722af + b0cd8a5 commit b8925f9

File tree

506 files changed

+24826
-422
lines changed

Some content is hidden

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

506 files changed

+24826
-422
lines changed

‎.gitignore

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@
2323
[Pp]rojectSettings/*.asset
2424
[Pp]rojectSettings/*.txt
2525

26+
# Ignore npmrc because it has auth keys in it
27+
.npmrc
28+
2629
# below taken from: https://github.com/github/gitignore/blob/master/Unity.gitignore
2730

2831
[Ll]ibrary/

‎Assets/com.unity.formats.fbx/EditorTests.meta renamed to ‎Assets/com.unity.formats.fbx.tests.meta

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/ConvertToModelTest.cs renamed to ‎Assets/com.unity.formats.fbx.tests/ConvertToModelTest.cs

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/ConvertToModelTest.cs.meta renamed to ‎Assets/com.unity.formats.fbx.tests/ConvertToModelTest.cs.meta

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/DefaultSelectionTest.cs renamed to ‎Assets/com.unity.formats.fbx.tests/DefaultSelectionTest.cs

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/DefaultSelectionTest.cs.meta renamed to ‎Assets/com.unity.formats.fbx.tests/DefaultSelectionTest.cs.meta

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/ExportPerformanceTest.cs renamed to ‎Assets/com.unity.formats.fbx.tests/ExportPerformanceTest.cs

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/ExportPerformanceTest.cs.meta renamed to ‎Assets/com.unity.formats.fbx.tests/ExportPerformanceTest.cs.meta

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/ExportTimelineClipTest.cs renamed to ‎Assets/com.unity.formats.fbx.tests/ExportTimelineClipTest.cs

File renamed without changes.

‎Assets/com.unity.formats.fbx/EditorTests/ExportTimelineClipTest.cs.meta renamed to ‎Assets/com.unity.formats.fbx.tests/ExportTimelineClipTest.cs.meta

File renamed without changes.

0 commit comments

Comments
 (0)