summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2012-11-06 11:21:33 -0500
committerBrad King <brad.king@kitware.com>2012-11-06 11:21:33 -0500
commit731ca02ecb635a8286cee9709a0b33c63cf3eb62 (patch)
tree7d3b4e630a1e2619e886d92499ecab30f17a7f63
parent7998ede9852407481db230017354bd24097ce260 (diff)
parenta4ae88bdb2b0954d2c9ccc8352915963987cbd34 (diff)
downloadcmake-731ca02ecb635a8286cee9709a0b33c63cf3eb62.tar.gz
Merge branch 'copyright-year' into release
-rw-r--r--Source/cmDocumentation.cxx2
-rwxr-xr-xbootstrap2
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/cmDocumentation.cxx b/Source/cmDocumentation.cxx
index c1360efca9..debde3be9a 100644
--- a/Source/cmDocumentation.cxx
+++ b/Source/cmDocumentation.cxx
@@ -155,7 +155,7 @@ static const char *cmDocumentationStandardSeeAlso[][3] =
static const char *cmDocumentationCopyright[][3] =
{
{0,
- "Copyright 2000-2009 Kitware, Inc., Insight Software Consortium. "
+ "Copyright 2000-2012 Kitware, Inc., Insight Software Consortium. "
"All rights reserved.", 0},
{0,
"Redistribution and use in source and binary forms, with or without "
diff --git a/bootstrap b/bootstrap
index 713f01f2bb..a4c4aa8aab 100755
--- a/bootstrap
+++ b/bootstrap
@@ -357,7 +357,7 @@ Directory and file names:
# Display CMake bootstrap usage
cmake_version_display()
{
- echo "CMake ${cmake_version}, Copyright 2000-2011 Kitware, Inc."
+ echo "CMake ${cmake_version}, Copyright 2000-2012 Kitware, Inc."
}
# Display CMake bootstrap error, display the log file and exit