Skip to content

Commit 769320a

Browse files
thalbernthalbern
authored
Merge branch 'mrtk_development' into prerelease/2.3.0_stabilization
2 parents b9491f5 + 144e8da commit 769320a

File tree

73 files changed

+505
-333
lines changed

Some content is hidden

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

73 files changed

+505
-333
lines changed

‎Assets/MixedRealityToolkit.Examples/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Gltf/Scripts/Editor/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/StandardShader/Scripts/Editor/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/UX/Interactables/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Demos/Utilities/InspectorFields/Inspectors/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Inspectors/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Examples")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

‎Assets/MixedRealityToolkit.Examples/Version.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
Microsoft Mixed Reality Toolkit 2.3.0
1+
Microsoft Mixed Reality Toolkit 2.4.0

‎Assets/MixedRealityToolkit.Extensions/LostTrackingService/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33

44
using System.Reflection;
55

6-
[assembly: AssemblyVersion("2.3.0.0")]
7-
[assembly: AssemblyFileVersion("2.3.0.0")]
6+
[assembly: AssemblyVersion("2.4.0.0")]
7+
[assembly: AssemblyFileVersion("2.4.0.0")]
88

99
[assembly: AssemblyProduct("Microsoft® Mixed Reality Toolkit Extensions")]
1010
[assembly: AssemblyCopyright("Copyright © Microsoft Corporation")]

0 commit comments

Comments
 (0)