Merging in updates from 0.2.5c

1 files changed, 14 insertions, 3 deletions

diff --git a/LibOVR/Src/OVR_Linux_DeviceManager.h b/LibOVR/Src/OVR_Linux_DeviceManager.h
index 69dabc0..101f871 100644
--- a/LibOVR/Src/OVR_Linux_DeviceManager.h
+++ b/LibOVR/Src/OVR_Linux_DeviceManager.h
@@ -5,12 +5,23 @@ Content     :   Linux-specific DeviceManager header.
 Created     :   
 Authors     :   
 
-Copyright   :   Copyright 2012 Oculus VR, Inc. All Rights reserved.
+Copyright   :   Copyright 2013 Oculus VR, Inc. All Rights reserved.
 
-Use of this software is subject to the terms of the Oculus license
-agreement provided at the time of installation or download, or which
+Licensed under the Oculus VR SDK License Version 2.0 (the "License"); 
+you may not use the Oculus VR 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-2.0 
+
+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,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+
 *************************************************************************************/
 
 #ifndef OVR_Linux_DeviceManager_h