# HG changeset patch
# User nemo
# Date 1321731058 18000
# Node ID a057306acea688594dccd7ac411d62c0dbd1cff2
# Parent  fcea0c053bc11d022c44a8c76327a63519652bbb# Parent  33c92c4ac749914ba7d23178f4210882f39fb530
Merge 0.9.17 with trunk

diff -r 33c92c4ac749 -r a057306acea6 CMakeLists.txt
--- a/CMakeLists.txt	Sat Nov 19 14:29:35 2011 -0500
+++ b/CMakeLists.txt	Sat Nov 19 14:30:58 2011 -0500
@@ -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)