[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.4 1.144.2.5

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt 
Log Message:
ENH: merge in from main tree


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.4
retrieving revision 1.144.2.5
diff -C 2 -d -r1.144.2.4 -r1.144.2.5
*** CMakeLists.txt	25 Mar 2008 23:58:58 -0000	1.144.2.4
--- CMakeLists.txt	26 Mar 2008 18:08:20 -0000	1.144.2.5
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 3)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable
--- 355,359 ----
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 4)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable