merged delta and c55

diff --cc makepackage_binary.sh
index 32d19865ab98e3585f5a52b379267a4209d68347,32d19865ab98e3585f5a52b379267a4209d68347..fac3a03747519c4b62cf5b6b43c066f1e2731f7a
--- 1/makepackage_binary.sh
--- 2/makepackage_binary.sh
+++ b/makepackage_binary.sh
@@@ -1,6 -1,6 +1,6 @@@
  #!/bin/sh
  
--PROJECT_NAME=minetest-delta
++PROJECT_NAME=minetest
  PACKAGEDIR=../$PROJECT_NAME-packages
  PACKAGENAME=$PROJECT_NAME-binary-`date +%y%m%d%H%M%S`
  PACKAGEPATH=$PACKAGEDIR/$PACKAGENAME

diff --cc src/CMakeLists.txt
index 4d51f7104c966c2e723c50a6e3b7b2df0d592f72,32177f8a9845786cadd3c2abd94fa941715acac4..ce53651b0dee22555de44788808c80595ec46c77
--- 1/src/CMakeLists.txt
--- 2/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@@ -1,6 -1,5 +1,5 @@@
- cmake_minimum_required( VERSION 2.6 )
- 
 -project(minetest-delta)
 +project(minetest)
+ cmake_minimum_required( VERSION 2.6 )
  
  if(RUN_IN_PLACE)
        add_definitions ( -DRUN_IN_PLACE )

diff --cc src/game.cpp
Simple merge

diff --cc src/guiPauseMenu.cpp
index 7745b8dd2103df40b27c0273109c1a8bb7aaac39,8ccf0c46880f4169aa8cf8211629e212692c1265..eae887a4ceaab048b3ea9a19d2720f9c4a953f2e
--- 1/src/guiPauseMenu.cpp
--- 2/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@@ -172,7 -173,7 +173,7 @@@ void GUIPauseMenu::regenerateGui(v2u32 
                );*/\r
  \r
                std::ostringstream os;\r
-               os<<"Minetest-c55\n";\r
 -              os<<"Minetest-delta\n";\r
++              os<<"Minetest\n";\r
                os<<"by Perttu Ahola and contributors\n";\r
                os<<"celeron55@gmail.com\n";\r
                os<<BUILD_INFO<<"\n";\r

diff --cc src/main.cpp
Simple merge