From: Perttu Ahola <celeron55@gmail.com>
Date: Fri, 5 Aug 2011 08:22:13 +0000 (+0300)
Subject: merged delta and c55
X-Git-Url: http://81.2.79.47:8989/gitweb/?a=commitdiff_plain;h=64a6da3e45838a6f764777728736dfa0f6678778;p=zefram%2Fminetest%2Fminetest_engine.git

merged delta and c55
---

64a6da3e45838a6f764777728736dfa0f6678778
diff --cc makepackage_binary.sh
index 32d19865,32d19865..fac3a037
--- a/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 4d51f710,32177f8a..ce53651b
--- a/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/guiPauseMenu.cpp
index 7745b8dd,8ccf0c46..eae887a4
--- a/src/guiPauseMenu.cpp
+++ b/src/guiPauseMenu.cpp
@@@ -172,7 -173,7 +173,7 @@@ void GUIPauseMenu::regenerateGui(v2u32 
  		);*/
  
  		std::ostringstream os;
- 		os<<"Minetest-c55\n";
 -		os<<"Minetest-delta\n";
++		os<<"Minetest\n";
  		os<<"by Perttu Ahola and contributors\n";
  		os<<"celeron55@gmail.com\n";
  		os<<BUILD_INFO<<"\n";