Aaaand merge .17 into trunk.
authornemo
Mon, 14 Nov 2011 13:15:55 -0500
changeset 6373 67de1f88d8f9
parent 6367 a7fbf18b2d55 (diff)
parent 6372 b392132a588c (current diff)
child 6374 b024e279587c
Aaaand merge .17 into trunk.
CMakeLists.txt
--- a/CMakeLists.txt	Mon Nov 14 13:14:32 2011 -0500
+++ b/CMakeLists.txt	Mon Nov 14 13:15:55 2011 -0500
@@ -12,7 +12,7 @@
 
 
 #detect Mercurial revision (if present)
-set(version_suffix "") #UNSET THIS VARIABLE AT RELEASE TIME
+set(version_suffix "-dev") #UNSET THIS VARIABLE AT RELEASE TIME
 set(HGCHANGED "")
 IF(version_suffix MATCHES "-dev")
 	set(HW_DEV true)