Merge branch 'master' of https://github.com/g-truc/glm

ago%!(EXTRA string=10 years) · 273beb8779
parent 869caacac5 64c86d1760
commit 273beb8779
1 changed files with 4 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -30,7 +30,6 @@
 # CMake
 CMakeCache.txt
 CMakeFiles
-Makefile
 cmake_install.cmake
 install_manifest.txt
 *.cmake
@ -43,5 +42,9 @@ Testing/*
 test/gtc/*.dds

 # Project Files
+Makefile
 *.cbp
 *.user
+
+# Misc.
+*.log