Commit graph

2 commits

Author SHA1 Message Date
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
Jeff Hutchinson
fd4628a08a glad cmake 2016-09-11 21:48:36 -04:00