Merge branch 'copyright-year' into release

This commit is contained in:
Brad King 2012-11-06 11:21:33 -05:00
commit 731ca02ecb
2 changed files with 2 additions and 2 deletions

View File

@ -155,7 +155,7 @@ static const char *cmDocumentationStandardSeeAlso[][3] =
static const char *cmDocumentationCopyright[][3] = static const char *cmDocumentationCopyright[][3] =
{ {
{0, {0,
"Copyright 2000-2009 Kitware, Inc., Insight Software Consortium. " "Copyright 2000-2012 Kitware, Inc., Insight Software Consortium. "
"All rights reserved.", 0}, "All rights reserved.", 0},
{0, {0,
"Redistribution and use in source and binary forms, with or without " "Redistribution and use in source and binary forms, with or without "

View File

@ -357,7 +357,7 @@ Directory and file names:
# Display CMake bootstrap usage # Display CMake bootstrap usage
cmake_version_display() 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 # Display CMake bootstrap error, display the log file and exit