[cmake-commits] hoffman committed CMakeLists.txt 1.97.2.32 1.97.2.33 ChangeLog.manual 1.1.8.36 1.1.8.37

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake
In directory public:/mounts/ram/cvs-serv20428

Modified Files:
      Tag: CMake-2-4
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge in changes from main tree that fix at only parsing


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.97.2.32
retrieving revision 1.97.2.33
diff -u -d -r1.97.2.32 -r1.97.2.33
--- CMakeLists.txt	1 Jun 2007 15:18:49 -0000	1.97.2.32
+++ CMakeLists.txt	5 Jun 2007 13:30:53 -0000	1.97.2.33
@@ -7,7 +7,7 @@
 SET(CMake_VERSION_MINOR 4)
 SET(CMake_VERSION_PATCH 7)
 # for an actual release this should not be defined
-SET(CMake_VERSION_RC 8)
+SET(CMake_VERSION_RC 9)
 SET(CMake_VERSION "${CMake_VERSION_MAJOR}.${CMake_VERSION_MINOR}")
 SET(CMake_VERSION_FULL "${CMake_VERSION}.${CMake_VERSION_PATCH}")
 

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.8.36
retrieving revision 1.1.8.37
diff -u -d -r1.1.8.36 -r1.1.8.37
--- ChangeLog.manual	1 Jun 2007 15:18:49 -0000	1.1.8.36
+++ ChangeLog.manual	5 Jun 2007 13:30:53 -0000	1.1.8.37
@@ -1,4 +1,6 @@
 Changes in CMake 2.4.7
+--- RC 9 ---
+* Fix problem with \@ in configure files bug# 5130 
 --- RC 8 ---
 * Fix bug 5121 crash with build test on and vs