[Cmake-commits] CMake branch, next, updated. v2.8.5-1375-ge91a92c

[Alexander Neundorf]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  e91a92c36e6ce62590434e6dfc9df050c2e85122 (commit)
       via  d50a61a1ae6a530e3ebc2672c2e5e38b700d61e8 (commit)
      from  84756adde02c976232fda7d42e27f824f0c070c2 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e91a92c36e6ce62590434e6dfc9df050c2e85122
commit e91a92c36e6ce62590434e6dfc9df050c2e85122
Merge: 84756ad d50a61a
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 1 17:46:49 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Aug 1 17:46:49 2011 -0400

    Merge topic 'WriteConfigVersionFile_2TemplateFiles' into next
    
    d50a61a Fix copyright notice


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d50a61a1ae6a530e3ebc2672c2e5e38b700d61e8
commit d50a61a1ae6a530e3ebc2672c2e5e38b700d61e8
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Mon Aug 1 23:44:17 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Mon Aug 1 23:44:17 2011 +0200

    Fix copyright notice
    
    Alex

diff --git a/Modules/WriteBasicConfigVersionFile.cmake b/Modules/WriteBasicConfigVersionFile.cmake
index 361eb60..d7947ab 100644
--- a/Modules/WriteBasicConfigVersionFile.cmake
+++ b/Modules/WriteBasicConfigVersionFile.cmake
@@ -23,10 +23,19 @@
 # Modules/BasicConfigVersion-AnyNewerVersion/SameMajorVersion.cmake.in to
 # create the resulting version file.
 
-# Copyright (c) 2008, Alexander Neundorf, <neundorf at kde.org>
+#=============================================================================
+# Copyright (c) 2008-2011, Alexander Neundorf, <neundorf at kde.org>
+# Copyright 2004-2009 Kitware, Inc.
 #
-# Redistribution and use is allowed according to the terms of the BSD license.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+# Distributed under the OSI-approved BSD License (the "License");
+# see accompanying file Copyright.txt for details.
+#
+# This software is distributed WITHOUT ANY WARRANTY; without even the
+# implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+# See the License for more information.
+#=============================================================================
+# (To distribute this file outside of CMake, substitute the full
+#  License text for the above reference.)
 
 include(CMakeParseArguments)
 

-----------------------------------------------------------------------

Summary of changes:
 Modules/WriteBasicConfigVersionFile.cmake |   15 ++++++++++++---
 1 files changed, 12 insertions(+), 3 deletions(-)


hooks/post-receive
-- 
CMake