aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVR/Src/Kernel/OVR_Allocator.cpp
diff options
context:
space:
mode:
authorBrad Davis <[email protected]>2014-01-10 18:02:40 -0800
committerBrad Davis <[email protected]>2014-01-10 18:02:40 -0800
commitf28388ff2af14b56ef2d973b2f4f9da021716d4c (patch)
treedcfcb263eb87741878b6b323bfa50e1dcdc0ba1b /LibOVR/Src/Kernel/OVR_Allocator.cpp
parentcdc395e194dcc287ec3749908b8e77b2499dd675 (diff)
Updating to 0.2.5c
Diffstat (limited to 'LibOVR/Src/Kernel/OVR_Allocator.cpp')
-rw-r--r--LibOVR/Src/Kernel/OVR_Allocator.cpp17
1 files changed, 14 insertions, 3 deletions
diff --git a/LibOVR/Src/Kernel/OVR_Allocator.cpp b/LibOVR/Src/Kernel/OVR_Allocator.cpp
index ec9a877..51eebba 100644
--- a/LibOVR/Src/Kernel/OVR_Allocator.cpp
+++ b/LibOVR/Src/Kernel/OVR_Allocator.cpp
@@ -5,12 +5,23 @@ Content : Installable memory allocator implementation
Created : September 19, 2012
Notes :
-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.
+
************************************************************************************/
#include "OVR_Allocator.h"