Remove obsolete files

2014-11-29 14:11:23 +00:00
parent f90056701c
commit 86a948320f
19 changed files with 6 additions and 176 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,8 @@
-bin
 .gradle
 .settings
-build
-<<<<<<< HEAD
-/cpp/pipe/Release/src
-=======
-src
->>>>>>> 1b005c69f5ba5b443ef5addc6aad13236196f3dc
+.project
+.classpath
+.project
+.maven
+bin
+build