Merge branch 'develop'

apply SFML develop change
2015-05-04 16:55:32 +02:00 · 2015-05-03 09:58:01 +02:00 · 2015-05-02 23:06:59 +02:00 · 2015-05-02 23:05:44 +02:00 · 2015-05-02 23:00:30 +02:00
5 changed files with 10 additions and 1 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,4 +1,5 @@
 CMakeFiles
+*.sh
 *.a
 *.o
 cmake_install.cmake
@ -6,5 +7,4 @@ Makefile
 CMakeCache.txt
 *.app
 2P11
-clear.sh
 *.vim
--- a/clear.sh
+++ b/clear.sh
@ -0,0 +1,9 @@
+#!/bin/bash
+
+path="$(dirname "$(readlink -f $0)")"
+
+find "$path" -name "CMakeFiles" -exec rm -rf {} \;
+find "$path" -name "CMakeCache.txt" -delete
+find "$path" -name "cmake_install.cmake" -delete
+find "$path" -name "Makefile" -delete
+
--- a/src/2P11
+++ b/src/2P11
--- a/src/Controllers/ConsoleController/libConsoleController.a
+++ b/src/Controllers/ConsoleController/libConsoleController.a
--- a/src/Model/libModel.a
+++ b/src/Model/libModel.a
Author	SHA1	Message	Date
manzerbredes	1570bc6210	Merge branch 'develop' apply SFML develop change	2015-05-04 16:55:32 +02:00
manzerbredes	8488827025	Merge branch 'develop' -Correct bugs -Manage score -Add some helpers -Optimize some code	2015-05-03 09:58:01 +02:00
manzerbredes	9759972f35	Edit gitignore	2015-05-02 23:06:59 +02:00
manzerbredes	710cc4001f	First stable fusionning	2015-05-02 23:05:44 +02:00
manzerbredes	fec126f0d2	Edit .gitignore	2015-05-02 23:00:30 +02:00