mirror/glm
1
0
Fork 0
mirror of https://github.com/g-truc/glm.git synced 2024-09-20 08:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed bad merge #483

Browse Source
This commit is contained in:
Christophe Riccio 2016-02-21 13:24:29 +01:00
parent 65e88d9f9d
commit 907cb9d968
1 changed files with 0 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
glm/detail/setup.hpp
View File

@ -313,11 +313,7 @@
# define GLM_COMPILER (GLM_COMPILER_GCC52)
# elif (__GNUC__ == 5) && (__GNUC_MINOR__ >= 3)
# define GLM_COMPILER (GLM_COMPILER_GCC53)
<<<<<<< HEAD
# elif (__GNUC__ == 6) && (__GNUC_MINOR__ >= 0)
=======
# elif (__GNUC__ >= 6)
>>>>>>> 0.9.7
# define GLM_COMPILER (GLM_COMPILER_GCC60)
# else
# define GLM_COMPILER (GLM_COMPILER_GCC)