diff options
| author | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
|---|---|---|
| committer | Donovan Baarda <abo@minkirri.apana.org.au> | 2014-06-12 14:53:43 +1000 |
| commit | 0669a40347ffa233bc6042b0f65d244509a61394 (patch) | |
| tree | 36a4577bdaa1ed28ca1ad222a54777012dd2dda8 /3rdparty-notices/LIBOVR-COPYING.txt | |
| parent | 72540e0a96a3120a5d02271e714aba29e136ab78 (diff) | |
| parent | 7454496476ba17ea622781d280606161581c9544 (diff) | |
Merge branch 'master' of https://github.com/opentrack/opentrack into dev/ewma2
Resolved conflicts manually in files:
ftnoir_filter_ewma2/ftnoir_filter_ewma2.cpp
ftnoir_filter_ewma2/ftnoir_filter_ewma2.h
Diffstat (limited to '3rdparty-notices/LIBOVR-COPYING.txt')
| -rw-r--r-- | 3rdparty-notices/LIBOVR-COPYING.txt | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/3rdparty-notices/LIBOVR-COPYING.txt b/3rdparty-notices/LIBOVR-COPYING.txt new file mode 100644 index 00000000..e23c0490 --- /dev/null +++ b/3rdparty-notices/LIBOVR-COPYING.txt @@ -0,0 +1,5 @@ +Copyright : Copyright 2012 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 +otherwise accompanies this software in either electronic or hard copy form.
\ No newline at end of file |