Conflicts: git/gitignore
@@ -1,6 +1,10 @@
+*.egg-info
*.pyc
*.pyd
*.pyo
.*.swp
.ycm_extra_conf.py
.~lock.*#
+CMakeCache.txt
+CMakeFiles
+cmake_install.cmake
Fabian Peter Hammerle
9 年 前
