merge trunk in 0.9.18 0.9.18
authorkoda
Mon, 29 Oct 2012 21:46:50 +0100
branch0.9.18
changeset 7884 60132c558c05
parent 7821 9353d5eb360e (diff)
parent 7882 35dfc54ba2c6 (current diff)
child 7886 4329a95710dc
merge trunk in 0.9.18
misc/libtremor/README
misc/libtremor/tremor/debian/Makefile.am
misc/libtremor/tremor/debian/changelog
misc/libtremor/tremor/debian/control
misc/libtremor/tremor/debian/copyright
misc/libtremor/tremor/debian/libvorbisidec-dev.install
misc/libtremor/tremor/debian/libvorbisidec1.install
misc/libtremor/tremor/debian/rules
misc/libtremor/tremor/dsp.c
misc/libtremor/tremor/floor_lookup.c
misc/libtremor/tremor/misc.c
misc/libtremor/tremor/vorbisidec.pc.in
--- a/CMakeLists.txt	Mon Oct 29 16:26:26 2012 -0400
+++ b/CMakeLists.txt	Mon Oct 29 21:46:50 2012 +0100
@@ -12,7 +12,7 @@
 
 
 #detect Mercurial revision (if present)
-set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME
 set(HGCHANGED "")
 IF(version_suffix MATCHES "-dev")
     set(HW_DEV true)
@@ -44,7 +44,7 @@
 set(CPACK_PACKAGE_VERSION_MAJOR 0)
 set(CPACK_PACKAGE_VERSION_MINOR 9)
 set(CPACK_PACKAGE_VERSION_PATCH 18${version_suffix})
-set(HEDGEWARS_PROTO_VER 42)
+set(HEDGEWARS_PROTO_VER 43)
 set(HEDGEWARS_VERSION "${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH}")