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

.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