summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorChaoren Lin <aoe@google.com>2016-07-12 11:53:58 -0700
committerChaoren Lin <aoe@google.com>2016-07-13 11:35:29 -0700
commitecf0ec027d28d2c26ce13075003dc57db20d279e (patch)
tree8ad8b5881235f6e813451e8916201104d8155bd5 /doc
parent091caafda44f7fe52a94387b2eafcf204ea909d3 (diff)
downloadlinux-x86-ecf0ec027d28d2c26ce13075003dc57db20d279e.tar.gz
Update prebuilts to CMake 3.6.0-rc2 (go/ab/3043163).
Change-Id: Ibe6715663df09f1d9ac5fcb588e12c657b2caab1
Diffstat (limited to 'doc')
-rw-r--r--doc/cmake-3.2/cmexpat/COPYING21
-rw-r--r--doc/cmake-3.6/Copyright.txt (renamed from doc/cmake-3.2/Copyright.txt)2
-rw-r--r--doc/cmake-3.6/cmcompress/Copyright.txt (renamed from doc/cmake-3.2/cmcompress/Copyright.txt)0
-rw-r--r--doc/cmake-3.6/cmcurl/COPYING (renamed from doc/cmake-3.2/cmcurl/COPYING)2
-rw-r--r--doc/cmake-3.6/cmlibarchive/COPYING (renamed from doc/cmake-3.2/cmlibarchive/COPYING)5
-rw-r--r--doc/cmake-3.6/cmliblzma/COPYING (renamed from doc/cmake-3.2/cmliblzma/COPYING)0
-rw-r--r--doc/cmake-3.6/cmsys/Copyright.txt (renamed from doc/cmake-3.2/cmsys/Copyright.txt)0
-rw-r--r--doc/cmake-3.6/cmzlib/Copyright.txt (renamed from doc/cmake-3.2/cmzlib/Copyright.txt)0
8 files changed, 4 insertions, 26 deletions
diff --git a/doc/cmake-3.2/cmexpat/COPYING b/doc/cmake-3.2/cmexpat/COPYING
deleted file mode 100644
index fc97b02..0000000
--- a/doc/cmake-3.2/cmexpat/COPYING
+++ /dev/null
@@ -1,21 +0,0 @@
-Copyright (c) 1998, 1999, 2000 Thai Open Source Software Center Ltd
- and Clark Cooper
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/doc/cmake-3.2/Copyright.txt b/doc/cmake-3.6/Copyright.txt
index 6c9fb09..f99998f 100644
--- a/doc/cmake-3.2/Copyright.txt
+++ b/doc/cmake-3.6/Copyright.txt
@@ -1,5 +1,5 @@
CMake - Cross Platform Makefile Generator
-Copyright 2000-2015 Kitware, Inc.
+Copyright 2000-2016 Kitware, Inc.
Copyright 2000-2011 Insight Software Consortium
All rights reserved.
diff --git a/doc/cmake-3.2/cmcompress/Copyright.txt b/doc/cmake-3.6/cmcompress/Copyright.txt
index 162332f..162332f 100644
--- a/doc/cmake-3.2/cmcompress/Copyright.txt
+++ b/doc/cmake-3.6/cmcompress/Copyright.txt
diff --git a/doc/cmake-3.2/cmcurl/COPYING b/doc/cmake-3.6/cmcurl/COPYING
index dd990b6..6b5d59f 100644
--- a/doc/cmake-3.2/cmcurl/COPYING
+++ b/doc/cmake-3.6/cmcurl/COPYING
@@ -1,6 +1,6 @@
COPYRIGHT AND PERMISSION NOTICE
-Copyright (c) 1996 - 2014, Daniel Stenberg, <daniel@haxx.se>.
+Copyright (c) 1996 - 2015, Daniel Stenberg, <daniel@haxx.se>.
All rights reserved.
diff --git a/doc/cmake-3.2/cmlibarchive/COPYING b/doc/cmake-3.6/cmlibarchive/COPYING
index b258806..93952b7 100644
--- a/doc/cmake-3.2/cmlibarchive/COPYING
+++ b/doc/cmake-3.6/cmlibarchive/COPYING
@@ -17,12 +17,11 @@ the actual statements in the files are controlling.
files for details:
libarchive/archive_entry.c
libarchive/archive_read_support_filter_compress.c
- libarchive/archive_write_set_filter_compress.c
+ libarchive/archive_write_add_filter_compress.c
libarchive/mtree.5
- tar/matching.c
* The following source files are in the public domain:
- tar/getdate.c
+ libarchive/archive_getdate.c
* The build files---including Makefiles, configure scripts,
and auxiliary scripts used as part of the compile process---have
diff --git a/doc/cmake-3.2/cmliblzma/COPYING b/doc/cmake-3.6/cmliblzma/COPYING
index 43c90d0..43c90d0 100644
--- a/doc/cmake-3.2/cmliblzma/COPYING
+++ b/doc/cmake-3.6/cmliblzma/COPYING
diff --git a/doc/cmake-3.2/cmsys/Copyright.txt b/doc/cmake-3.6/cmsys/Copyright.txt
index 1549a7d..1549a7d 100644
--- a/doc/cmake-3.2/cmsys/Copyright.txt
+++ b/doc/cmake-3.6/cmsys/Copyright.txt
diff --git a/doc/cmake-3.2/cmzlib/Copyright.txt b/doc/cmake-3.6/cmzlib/Copyright.txt
index db0beae..db0beae 100644
--- a/doc/cmake-3.2/cmzlib/Copyright.txt
+++ b/doc/cmake-3.6/cmzlib/Copyright.txt