Skip to content

Commit

Permalink
Merge pull request #1096 from StephenHodgson/MRTK-Local
Browse files Browse the repository at this point in the history
Updated Unity Editor to 2017.1.2
  • Loading branch information
StephenHodgson committed Oct 6, 2017
2 parents 67be98f + a601083 commit c82e2c2
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 4 deletions.
3 changes: 2 additions & 1 deletion ProjectSettings/ProjectSettings.asset
Original file line number Diff line number Diff line change
Expand Up @@ -240,6 +240,7 @@ PlayerSettings:
m_Icon: {fileID: 0}
m_Width: 128
m_Height: 128
m_Kind: 0
m_BuildTargetBatching: []
m_BuildTargetGraphicsAPIs: []
m_BuildTargetVRSettings:
Expand Down Expand Up @@ -581,7 +582,7 @@ PlayerSettings:
m_RenderingPath: 1
m_MobileRenderingPath: 1
metroPackageName: MixedRealityToolkit-Unity
metroPackageVersion: 1.2017.1.1
metroPackageVersion: 1.2017.1.2
metroCertificatePath: Assets/WSATestCertificate.pfx
metroCertificatePassword:
metroCertificateSubject: DefaultCompany
Expand Down
2 changes: 1 addition & 1 deletion ProjectSettings/ProjectVersion.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
m_EditorVersion: 2017.1.1f1
m_EditorVersion: 2017.1.2f1
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ Learn more about [mixed reality](https://developer.microsoft.com/en-us/windows/m
[github-rel-badge]: https://img.shields.io/github/tag/microsoft/MixedRealityToolkit-unity.svg?style=flat-square&label=latest%20master%20branch%20release&colorB=007ec6
[![Github Release][github-rel-badge]][github-rel]

[unity-download]: https://unity3d.com/unity/whats-new/unity-2017.1.1
[unity-version-badge]: https://img.shields.io/badge/current%20unity%20editor%20version-2017.1.1f1-green.svg
[unity-download]: https://unity3d.com/unity/whats-new/unity-2017.1.2
[unity-version-badge]: https://img.shields.io/badge/current%20unity%20editor%20version-2017.1.2f1-green.svg
[![Github Release][unity-version-badge]][unity-download]

# Feature areas
Expand Down

0 comments on commit c82e2c2

Please sign in to comment.