Skip to content
Snippets Groups Projects
Commit 6a9d23b7 authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for open-189

parents f70296ec 0142a0c6
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
doc/contributions.txt
+ 1
− 0
View file @ 6a9d23b7
...@@ -1134,6 +1134,7 @@ Slee Mayo ...@@ -1134,6 +1134,7 @@ Slee Mayo
snowy Sidran snowy Sidran
Sovereign Engineer Sovereign Engineer
MAINT-2334 MAINT-2334
OPEN-189
SpacedOut Frye SpacedOut Frye
VWR-34 VWR-34
VWR-45 VWR-45
......
indra/llwindow/llwindowmacosx-objc.h
+ 5
− 0
View file @ 6a9d23b7
...@@ -25,6 +25,9 @@ ...@@ -25,6 +25,9 @@
* $/LicenseInfo$ * $/LicenseInfo$
*/ */
#ifndef LL_LLWINDOWMACOSX_OBJC_H
#define LL_LLWINDOWMACOSX_OBJC_H
#include <map> #include <map>
#include <vector> #include <vector>
...@@ -143,3 +146,5 @@ NSWindowRef getMainAppWindow(); ...@@ -143,3 +146,5 @@ NSWindowRef getMainAppWindow();
GLViewRef getGLView(); GLViewRef getGLView();
unsigned int getModifiers(); unsigned int getModifiers();
#endif // LL_LLWINDOWMACOSX_OBJC_H
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment