summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMuhammadWang <wangyulong@gmail.com>2014-02-16 18:16:00 +0100
committerMuhammadWang <wangyulong@gmail.com>2014-02-16 18:25:17 +0100
commite0868c5c062ec81ec268942657517cc8119034c0 (patch)
tree7007930815c7acf0bb43404c5a8ede1a5aad7252
parentMerge pull request #687 from worktycho/Flags (diff)
downloadcuberite-e0868c5c062ec81ec268942657517cc8119034c0.tar
cuberite-e0868c5c062ec81ec268942657517cc8119034c0.tar.gz
cuberite-e0868c5c062ec81ec268942657517cc8119034c0.tar.bz2
cuberite-e0868c5c062ec81ec268942657517cc8119034c0.tar.lz
cuberite-e0868c5c062ec81ec268942657517cc8119034c0.tar.xz
cuberite-e0868c5c062ec81ec268942657517cc8119034c0.tar.zst
cuberite-e0868c5c062ec81ec268942657517cc8119034c0.zip
-rw-r--r--.gitignore5
-rw-r--r--MCServer/.gitignore1
2 files changed, 5 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 007b21519..c8ad93a80 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,6 +22,9 @@ cloc.xsl
*.*~
*~
*.orig
+## Eclipse
+.cproject
+.project
# world inside source
ChunkWorx.ini
@@ -57,7 +60,7 @@ install_mainfest.txt
src/MCServer
lib/tolua++/tolua
src/Bindings/Bindings.*
-src/Bindings/BindingsDependecies.txt
+src/Bindings/BindingDependecies.txt
MCServer.dir/
#win32 cmake stuff
diff --git a/MCServer/.gitignore b/MCServer/.gitignore
index e3aebbf92..0fd04ef59 100644
--- a/MCServer/.gitignore
+++ b/MCServer/.gitignore
@@ -4,6 +4,7 @@
*.lib
*.ini
MCServer
+MCServer_debug
CommLogs/
logs
players