modified project settings

This commit is contained in:
2013-07-20 16:22:54 +02:00
parent 164a8354cc
commit 625275e5c9
9 changed files with 9 additions and 81 deletions

11
.gitignore vendored
View File

@@ -1,11 +1,8 @@
<<<<<<< HEAD
<<<<<<< HEAD
/cpp/wiipair/.settings
/cpp/wiipair/Release/src
=======
/java/bin
>>>>>>> c9d82ef8e884d27d6c5215d5b2fb851cf81162f8
=======
/cpp/wiiuse/Debug/src
/cpp/wiipair/.settings
/cpp/wiipair/Release/src
/cpp/wiiuse/Debug/src
>>>>>>> develop-wiiuse
/cpp/mimis/Debug/src