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

1 files changed, 3 insertions, 2 deletions

diff --git a/LibOVR/Src/Displays/OVR_OSX_Display.h b/LibOVR/Src/Displays/OVR_OSX_Display.h
index a69c955..d76e8db 100644
--- a/LibOVR/Src/Displays/OVR_OSX_Display.h
+++ b/LibOVR/Src/Displays/OVR_OSX_Display.h
@@ -53,6 +53,7 @@ struct DisplayDesc
     Sizei       LogicalResolutionInPixels;
     Sizei       NativeResolutionInPixels;
     Vector2i    DesktopDisplayOffset;
+    int         Rotation;
 };
 
 
@@ -112,8 +113,8 @@ public:
                 dd.NativeResolutionInPixels,
                 dd.DesktopDisplayOffset,
                 0,
-                0,
-				false)
+                dd.Rotation,
+				        false)
     {
     }