Merge remote-tracking branch 'remotes/origin/development' into mars-v…

…olume-queries

CHANGELOG.md

@@ -4,6 +4,9 @@ All notable changes to this package will be documented in this file.
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/)
 and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [0.4.7-preview] - 2020-02-07
+- Update third party notices per legal review
+
 ## [0.4.6-preview] - 2020-02-02
 - Fix an issue where it is possible to undo input bindings on first import, causing exceptions
 

Third Party Notices.md

@@ -3,7 +3,7 @@ This package contains third-party software components governed by the license(s)
 
 Component Name: UnityOctree
 
-License Type: Nition
+License Type: BSD 2-clause
 
 Copyright (c) 2014, Nition
 All rights reserved.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "com.unity.labs.editorxr",
   "displayName": "EditorXR",
-  "version": "0.4.6-preview",
+  "version": "0.4.7-preview",
   "unity": "2019.1",
   "unityRelease": "14f1",
   "description": "Author XR in XR\nEditorXR provides a basic set of authoring tools and a framework for using and developing spatial authoring environments. This package adds the VR View to the Unity Editor, allowing users to take advantage of VR devices like Oculus Rift and HTC Vive in edit mode and work directly on their project and scenes in VR.\nIt is also possible to build EditorXR and its tools and workspaces into Player builds for use on devices like Oculus Quest or to incoroprate authoring components into end-user experiences.",