Jeff Hutchinson 0296e6d3fd Fix merge conflict and add check for unix and not apple for glx ... Merge branch 'development-gg' into gladdev # Conflicts: # Tools/CMake/libraries/glad.cmake		2016-11-02 21:55:24 -04:00
..
menus	Fixes the member-of-class check order to properly sort the context. Also fixes a bug with the spacer entries being filtered from the popup menu, which threw off the selection.	2016-07-06 00:46:16 -05:00
threads	SDL & Win32 platform threads cleanup.	2016-09-28 11:13:25 +10:00
sdlInput.cpp	more unused variable cleanups	2016-10-16 14:41:34 -05:00
sdlInput.h	PlatformSDL implementation.	2015-01-19 01:17:37 +01:00
sdlMsgBox.cpp	release the mouse from window constraints when poping up a window prompt	2015-08-10 21:54:30 -05:00
sdlPlatformGL.cpp	Fix merge conflict and add check for unix and not apple for glx	2016-11-02 21:55:24 -04:00