[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.10 1.144.2.11 ChangeLog.manual 1.1.10.6 1.1.10.7

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	CMakeLists.txt ChangeLog.manual 
Log Message:
ENH: merge from head for RC7


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.10
retrieving revision 1.144.2.11
diff -C 2 -d -r1.144.2.10 -r1.144.2.11
*** CMakeLists.txt	8 Apr 2008 16:22:47 -0000	1.144.2.10
--- CMakeLists.txt	9 Apr 2008 18:57:31 -0000	1.144.2.11
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 61)
  # 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 7)
  # CVS versions are odd, if this is an odd minor version
  # then set the CMake_VERSION_DATE variable

Index: ChangeLog.manual
===================================================================
RCS file: /cvsroot/CMake/CMake/Attic/ChangeLog.manual,v
retrieving revision 1.1.10.6
retrieving revision 1.1.10.7
diff -C 2 -d -r1.1.10.6 -r1.1.10.7
*** ChangeLog.manual	8 Apr 2008 16:22:47 -0000	1.1.10.6
--- ChangeLog.manual	9 Apr 2008 18:57:31 -0000	1.1.10.7
***************
*** 1,3 ****
! Changes in CMake 2.6.0 RC 61
  - Change install location on mac for cmake-gui
  - Fix for bugs 6730 and 6720 in FindQt4 configured headers in binary dir
--- 1,5 ----
! Changes in CMake 2.6.0 RC 7
! - Fix for chrpath on sun with gcc
! - Fix FindJNI on unix with HKEY issue bug 6688
  - Change install location on mac for cmake-gui
  - Fix for bugs 6730 and 6720 in FindQt4 configured headers in binary dir