aboutsummaryrefslogtreecommitdiffstats
path: root/LibOVRKernel/Src/Kernel/OVR_Log.cpp
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'vanilla_0.5.0.1' into jogamp_0.5.0.1Sven Gothel2015-03-281-0/+2
| | | | | | | | | | | | 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
* Bump OculusVR RIFT SDK to 0.5.0.1vanilla_0.5.0.1Sven Gothel2015-03-281-0/+504