Mercurial Mercurial > sheepy-clone / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge trunk into 0.9.15, excluding CMakeLists.txt and ChangeLog.txt - this should fix snowball again, pick up some more translation changes, hide the seed button by default and fix a couple of frontend desyncs 0.9.15
authornemo
Mon, 27 Dec 2010 12:47:51 -0500
branch0.9.15
changeset 4721 5e50d8162a96
parent 4700 e8fd20b2d66b (diff)
parent 4720 a9f9c96db60c (current diff)
child 4723 29ab0d49c3e6
Merge trunk into 0.9.15, excluding CMakeLists.txt and ChangeLog.txt - this should fix snowball again, pick up some more translation changes, hide the seed button by default and fix a couple of frontend desyncs
CMakeLists.txt file | annotate | diff | comparison | revisions
ChangeLog.txt file | annotate | diff | comparison | revisions 
--- a/CMakeLists.txt	Mon Dec 27 12:43:29 2010 -0500
+++ b/CMakeLists.txt	Mon Dec 27 12:47:51 2010 -0500
@@ -8,7 +8,7 @@
 ENDIF()
 
 #detect Mercurial revision (if present)
-set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+#set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
 IF(version_suffix MATCHES "-dev")
 	set(HW_DEV true)
 	IF (EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/.hg)
@@ -165,7 +165,7 @@
 set(EXECUTABLE_OUTPUT_PATH ${PROJECT_BINARY_DIR}/bin)
 
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
-set(HEDGEWARS_PROTO_VER 34)
+set(HEDGEWARS_PROTO_VER 37)
 
 if(WITH_SERVER)
 	message(STATUS "Server is going to be built! Make sure you have GHC installed")
@@ -239,14 +239,13 @@
 	"release$"
 	"Debug$"
 	"Release$"
-	"proto\\\\.inc$"
-	"hwconsts\\\\.cpp$"
-	"playlist\\\\.inc$"
+	"proto.inc$"
+	"hwconsts.cpp$"
+	"playlist.inc$"
 	"CPack"
-	"cmake_install\\\\.cmake$"
-	"config\\\\.inc$"
-	"hwengine\\\\.desktop$"
-	"CMakeCache\\\\.txt$"
+	"cmake_install.cmake$"
+	"config.inc$"
+	"hwengine.desktop$"
 #   "^${CMAKE_CURRENT_SOURCE_DIR}/misc/libopenalbridge"
 	"^${CMAKE_CURRENT_SOURCE_DIR}/project_files/HedgewarsMobile/"
 	"^${CMAKE_CURRENT_SOURCE_DIR}/bin/[a-z]"
--- a/ChangeLog.txt	Mon Dec 27 12:43:29 2010 -0500
+++ b/ChangeLog.txt	Mon Dec 27 12:47:51 2010 -0500
@@ -23,7 +23,6 @@
  + New hats: beaver, porkey, sheep
  + Add density property to Gears
  + Reworked management of schemes and weapon sets
- + Will ask before deleting teams, schemes and weapon sets
  + Explosions detach rope from land
  + Allow hog speech when not your turn
sheepy-clone