Merge branch 'vanilla_0.4.4' and resolve conflicts

TODO: Validate for removed patches due to relocation

Resolved Conflicts:
	LibOVR/Src/Kernel/OVR_ThreadsWinAPI.cpp
	LibOVR/Src/OVR_Linux_HMDDevice.cpp
	LibOVR/Src/OVR_OSX_HMDDevice.cpp
	LibOVR/Src/OVR_Profile.cpp
	LibOVR/Src/OVR_Sensor2Impl.cpp
	LibOVR/Src/OVR_SensorFusion.cpp
	LibOVR/Src/OVR_SensorImpl.cpp
	LibOVR/Src/OVR_Win32_DeviceStatus.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.cpp
	LibOVR/Src/OVR_Win32_HIDDevice.h
	LibOVR/Src/OVR_Win32_HMDDevice.cpp

1 files changed, 4 insertions, 4 deletions

diff --git a/LibOVR/Src/CAPI/D3D1X/CAPI_D3D10_DistortionRenderer.h b/LibOVR/Src/CAPI/D3D1X/CAPI_D3D10_DistortionRenderer.h
index dd697be..a6750f5 100644
--- a/LibOVR/Src/CAPI/D3D1X/CAPI_D3D10_DistortionRenderer.h
+++ b/LibOVR/Src/CAPI/D3D1X/CAPI_D3D10_DistortionRenderer.h
@@ -5,16 +5,16 @@ Content     :   Distortion renderer header for D3D10
 Created     :   November 11, 2013

 Authors     :   Michael Antonov

 

-Copyright   :   Copyright 2014 Oculus VR, Inc. All Rights reserved.

+Copyright   :   Copyright 2014 Oculus VR, LLC All Rights reserved.

 

-Licensed under the Oculus VR Rift SDK License Version 3.1 (the "License"); 

+Licensed under the Oculus VR Rift SDK License Version 3.2 (the "License"); 

 you may not use the Oculus VR Rift SDK except in compliance with the License, 

 which is provided at the time of installation or download, or which 

 otherwise accompanies this software in either electronic or hard copy form.

 

 You may obtain a copy of the License at

 

-http://www.oculusvr.com/licenses/LICENSE-3.1 

+http://www.oculusvr.com/licenses/LICENSE-3.2 

 

 Unless required by applicable law or agreed to in writing, the Oculus VR SDK 

 distributed under the License is distributed on an "AS IS" BASIS,

@@ -31,4 +31,4 @@ limitations under the License.
 #include "CAPI_D3D1X_DistortionRenderer.h"

 #undef OVR_D3D_VERSION

 

-#endif
\ No newline at end of file
+#endif