diff options
| author | Sven Gothel <[email protected]> | 2015-03-21 23:01:12 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-21 23:01:12 +0100 |
| commit | 0c5c4be020c2d55540058a49b2a879f46d5a1e13 (patch) | |
| tree | 00f84c2ca18cc233b826014094b9cad0769a3ea5 /jogl | |
| parent | cbbd775b6c754927632c333ff01424a0d2048c7c (diff) | |
| parent | e490c3c7f7bb5461cfa78a214827aa534fb43a3e (diff) | |
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
Diffstat (limited to 'jogl')
0 files changed, 0 insertions, 0 deletions