1
0
Fork 0

Fix conflict

This commit is contained in:
MrDev023 2016-09-29 21:34:19 +02:00
commit 62272f3df6
3 changed files with 677 additions and 1 deletions

3
.gitignore vendored
View file

@ -5,4 +5,5 @@ CMakeFiles/*
cmake_install.cmake
CMakeCache.txt
Libraries_src/*
Makefile
Makefile