Edit gitignore

This commit is contained in:
manzerbredes 2015-05-02 23:06:59 +02:00
parent 710cc4001f
commit 9759972f35

5
.gitignore vendored
View file

@ -1,15 +1,10 @@
CMakeFiles CMakeFiles
<<<<<<< HEAD
*.sh *.sh
2P11
=======
*.a *.a
*.o *.o
>>>>>>> develop
cmake_install.cmake cmake_install.cmake
Makefile Makefile
CMakeCache.txt CMakeCache.txt
*.app *.app
2P11 2P11
clear.sh
*.vim *.vim