Skip to content

Commit dd737d1

Browse files
authored
Merge pull request #929 from StephenHodgson/HTK-local
Updated Unity Editor version to 2017.1.1f1
2 parents 9a273b6 + a6d0623 commit dd737d1

File tree

9 files changed

+13
-31
lines changed

9 files changed

+13
-31
lines changed

.gitignore

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# =============== #
22
# Unity generated #
33
# =============== #
4-
Temp/
5-
Obj/
6-
Bin/
7-
Builds/
8-
UnityGenerated/
9-
Library/
10-
Assets/AssetStoreTools*
11-
App/
4+
[Tt]emp/
5+
[Oo]bj/
6+
[Bb]in/
7+
[Bb]uilds/
8+
[Bb]uild/
9+
[Ll]ibrary/
10+
[Aa]pp/
1211
UWP/
13-
/WindowsStoreApp
12+
WindowsStoreApp/
13+
UnityGenerated/
1414
project.json
1515
project.lock.json
1616

@@ -38,6 +38,6 @@ obj/
3838
*.log
3939
*.idb
4040
*.opendb
41+
4142
WSATestCertificate.pfx
4243
WSATestCertificate.pfx.meta
43-
/Assets/HoloToolkit-Examples/FastConfigurableShader/Scenes/FastConfigurableTest

Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.
Binary file not shown.

Assets/HoloToolkit-Examples/SharingWithUNET/Scenes/sharingwithunet/LightingData.asset.meta

Lines changed: 0 additions & 9 deletions
This file was deleted.
Binary file not shown.
Binary file not shown.
-247 Bytes
Binary file not shown.

ProjectSettings/ProjectVersion.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
m_EditorVersion: 2017.1.0p5
1+
m_EditorVersion: 2017.1.1f1

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ Learn more about [mixed reality](https://developer.microsoft.com/en-us/windows/m
1414
[github-rel-badge]: https://img.shields.io/github/tag/microsoft/MixedRealityToolkit-unity.svg?style=flat-square&label=latest%20master%20branch%20release&colorB=007ec6
1515
[![Github Release][github-rel-badge]][github-rel]
1616

17-
[unity-download]: https://unity3d.com/unity/qa/patch-releases/2017.1.0p5
18-
[unity-version-badge]: https://img.shields.io/badge/current%20unity%20editor%20version-2017.1.0p5-green.svg
17+
[unity-download]: https://unity3d.com/unity/whats-new/unity-2017.1.1
18+
[unity-version-badge]: https://img.shields.io/badge/current%20unity%20editor%20version-2017.1.1f1-green.svg
1919
[![Github Release][unity-version-badge]][unity-download]
2020

2121
# Feature areas

0 commit comments

Comments
 (0)