diff options
| author | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-28 02:08:11 +0100 |
| commit | 450aa6f7df9e67dd256b86f94e65eaf707032aad (patch) | |
| tree | 04aa207d84ddc8ca246d2573aaaf756b3ce8a0b5 /LibOVRKernel/Projects/Mac/LibOVRKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata | |
| parent | 3c7b8a17e907f4ef2afd9f77db566a3f6179cbe4 (diff) | |
| parent | 4207f9c279e832e3afcb3f5fc6cd8d84cb4cfe4c (diff) | |
Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1
Conflicts:
LibOVR/Include/OVR_CAPI_0_5_0.h
LibOVR/Src/CAPI/CAPI_HMDState.cpp
LibOVR/Src/Displays/OVR_Win32_Dxgi_Display.h
LibOVR/Src/Kernel/OVR_System.cpp
LibOVR/Src/OVR_CAPI.cpp
LibOVR/Src/OVR_Profile.cpp
LibOVRKernel/Src/Kernel/OVR_ThreadsWinAPI.cpp
LibOVRKernel/Src/Kernel/OVR_Types.h
Diffstat (limited to 'LibOVRKernel/Projects/Mac/LibOVRKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata')
| -rw-r--r-- | LibOVRKernel/Projects/Mac/LibOVRKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/LibOVRKernel/Projects/Mac/LibOVRKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata b/LibOVRKernel/Projects/Mac/LibOVRKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata new file mode 100644 index 0000000..b6c8fcb --- /dev/null +++ b/LibOVRKernel/Projects/Mac/LibOVRKernel.xcodeproj/project.xcworkspace/contents.xcworkspacedata @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+ version = "1.0">
+ <FileRef
+ location = "self:LibOVRKernel.xcodeproj">
+ </FileRef>
+</Workspace>
|