[Cmake-commits] CMake branch, next, updated. v2.8.4-1857-g0eecf40

[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  0eecf40a940124f054e2de9056cebfb556169f1f (commit)
       via  d64ba0b8b4112f1882f1bd96888d37349ab83112 (commit)
      from  88253ce3094cf489c31774fab1a94e3ca9cf78d7 (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=0eecf40a940124f054e2de9056cebfb556169f1f
commit 0eecf40a940124f054e2de9056cebfb556169f1f
Merge: 88253ce d64ba0b
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Thu Jul 7 16:28:50 2011 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Thu Jul 7 16:28:50 2011 -0400

    Merge topic 'PushCheckState' into next
    
    d64ba0b Fix copyright notice test


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=d64ba0b8b4112f1882f1bd96888d37349ab83112
commit d64ba0b8b4112f1882f1bd96888d37349ab83112
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Thu Jul 7 22:26:07 2011 +0200
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Thu Jul 7 22:26:07 2011 +0200

    Fix copyright notice test
    
    Alex

diff --git a/Modules/CMakePushCheckState.cmake b/Modules/CMakePushCheckState.cmake
index 52503e5..0a42128 100644
--- a/Modules/CMakePushCheckState.cmake
+++ b/Modules/CMakePushCheckState.cmake
@@ -17,10 +17,19 @@
 #   check_function_exists(...)
 #   cmake_pop_check_state()
 
-# Copyright (c) 2006-2011, Alexander Neundorf, <neundorf at kde.org>
+#=============================================================================
+# Copyright 2006-2011 Alexander Neundorf, <neundorf at kde.org>
 #
-# 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.)
+
 
 MACRO(CMAKE_PUSH_CHECK_STATE)
 

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

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


hooks/post-receive
-- 
CMake