# HG changeset patch
# User nemo
# Date 1310414626 14400
# Node ID ed8d9c8ae98288e0320ac4128d8bb15418ad4c84
# Parent  92b8cc5de1646870e440bed2191ce45978632bf2# Parent  d95cb8f8bd91d25bc7054ed15418970ccc619e49
merge

diff -r d95cb8f8bd91 -r ed8d9c8ae982 CMakeLists.txt
--- a/CMakeLists.txt	Sat Jul 09 21:30:36 2011 +0200
+++ b/CMakeLists.txt	Mon Jul 11 16:03:46 2011 -0400
@@ -1,11 +1,15 @@
 project(hedgewars)
 
+
+#initialise cmake environment
 cmake_minimum_required(VERSION 2.6.0 FATAL_ERROR)
 FOREACH(policy CMP0003 CMP0012)
 	IF(POLICY ${policy})
 		CMAKE_POLICY(SET ${policy} NEW)
 	ENDIF()
 ENDFOREACH()
+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
+
 
 #detect Mercurial revision (if present)
 set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
@@ -33,11 +37,14 @@
 	set(HW_DEV false)
 ENDIF()
 
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_modules)
 
-set( CPACK_PACKAGE_VERSION_MAJOR 0 )
-set( CPACK_PACKAGE_VERSION_MINOR 9 )
-set( CPACK_PACKAGE_VERSION_PATCH 16${version_suffix} )
+#versioning
+set(CPACK_PACKAGE_VERSION_MAJOR 0)
+set(CPACK_PACKAGE_VERSION_MINOR 9)
+set(CPACK_PACKAGE_VERSION_PATCH 16${version_suffix})
+set(HEDGEWARS_PROTO_VER 38)
+set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")
+
 
 #set some safe values
 IF(NOT WITH_SERVER)
@@ -49,6 +56,7 @@
 set(target_dir "bin")
 
 
+#bundle .app setup
 if(APPLE)
 	set(CMAKE_FIND_FRAMEWORK "FIRST")
 
@@ -165,8 +173,6 @@
 endif()
 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 38 )
 
 if(WITH_SERVER)
 	find_program(ghc_executable ghc)
@@ -192,8 +198,8 @@
 	add_subdirectory(tools)
 endif()
 
-# CPack vars
 
+# CPack variables
 set(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Hedgewars, a free turn-based strategy")
 set(CPACK_PACKAGE_VENDOR "Hedgewars Project")
 set(CPACK_PACKAGE_FILE_NAME "hedgewars-${HEDGEWARS_VERSION}")
@@ -275,3 +281,4 @@
 )
 
 include(CPack)
+
diff -r d95cb8f8bd91 -r ed8d9c8ae982 QTfrontend/pagemain.cpp
--- a/QTfrontend/pagemain.cpp	Sat Jul 09 21:30:36 2011 +0200
+++ b/QTfrontend/pagemain.cpp	Mon Jul 11 16:03:46 2011 -0400
@@ -91,7 +91,7 @@
         Tips << tr("Most weapons won't work once they touch the water. The Homing Bee as well as the Cake are exceptions to this.", "Tips");
         Tips << tr("The Old Limbuger only causes a small explosion. However the wind affected smelly cloud can poison lots of hogs at once.", "Tips");
         Tips << tr("The Piano Strike is the most damaging air strike. You'll lose the hedgehog performing it, so there's a huge downside as well.", "Tips");
-        Tips << tr("The Homing Bee can be tricky to use. Its turn radius depends on it's velocity, so try to not use full power.", "Tips");
+        Tips << tr("The Homing Bee can be tricky to use. Its turn radius depends on its velocity, so try to not use full power.", "Tips");
         Tips << tr("Sticky Mines are a perfect tool to create small chain reactions knocking enemy hedgehogs into dire situations ... or water.", "Tips");
         Tips << tr("The Hammer is most effective when used on bridges or girders. Hit hogs will just break through the ground.", "Tips");
         Tips << tr("If you're stuck behind an enemy hedgehog, use the Hammer to free yourself without getting damaged by an explosion.", "Tips");