[Cmake-commits] [cmake-commits] hoffman committed CMakeLists.txt 1.144.2.15 1.144.2.16 ChangeLog.manual 1.1.10.13 1.1.10.14

[cmake-commits at cmake.org]

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

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


Index: CMakeLists.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/CMakeLists.txt,v
retrieving revision 1.144.2.15
retrieving revision 1.144.2.16
diff -C 2 -d -r1.144.2.15 -r1.144.2.16
*** CMakeLists.txt	23 Apr 2008 02:05:39 -0000	1.144.2.15
--- CMakeLists.txt	23 Apr 2008 12:50:37 -0000	1.144.2.16
***************
*** 355,359 ****
  SET(CMake_VERSION_MINOR 6)
  SET(CMake_VERSION_PATCH 0)
! SET(CMake_VERSION_RC 83)
  # 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 84)
  # 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.13
retrieving revision 1.1.10.14
diff -C 2 -d -r1.1.10.13 -r1.1.10.14
*** ChangeLog.manual	23 Apr 2008 02:05:39 -0000	1.1.10.13
--- ChangeLog.manual	23 Apr 2008 12:50:37 -0000	1.1.10.14
***************
*** 1,2 ****
--- 1,6 ----
+ Changes in CMake 2.6.0 RC 84
+ 
+ - Preserve static libraries when linked multiple times 
+ 
  Changes in CMake 2.6.0 RC 83