summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorPavel Labath <labath@google.com>2016-05-17 10:02:28 +0100
committerPavel Labath <labath@google.com>2016-05-18 16:41:34 +0000
commit2558e7154fe7da69d90c6f99632a84b624a90a9a (patch)
tree01b6efc8719b523e315cc868d31f203602f385f7 /doc
parent091caafda44f7fe52a94387b2eafcf204ea909d3 (diff)
downloadlinux-x86-2558e7154fe7da69d90c6f99632a84b624a90a9a.tar.gz
source: go/ab/2846898 Change-Id: I762a07bd4ff86251b349d36ae9359256204cd313
Diffstat (limited to 'doc')
-rw-r--r--doc/cmake-3.5/Copyright.txt (renamed from doc/cmake-3.2/Copyright.txt)2
-rw-r--r--doc/cmake-3.5/cmcompress/Copyright.txt (renamed from doc/cmake-3.2/cmcompress/Copyright.txt)0
-rw-r--r--doc/cmake-3.5/cmcurl/COPYING (renamed from doc/cmake-3.2/cmcurl/COPYING)2
-rw-r--r--doc/cmake-3.5/cmexpat/COPYING (renamed from doc/cmake-3.2/cmexpat/COPYING)0
-rw-r--r--doc/cmake-3.5/cmlibarchive/COPYING (renamed from doc/cmake-3.2/cmlibarchive/COPYING)5
-rw-r--r--doc/cmake-3.5/cmliblzma/COPYING (renamed from doc/cmake-3.2/cmliblzma/COPYING)0
-rw-r--r--doc/cmake-3.5/cmsys/Copyright.txt (renamed from doc/cmake-3.2/cmsys/Copyright.txt)0
-rw-r--r--doc/cmake-3.5/cmzlib/Copyright.txt (renamed from doc/cmake-3.2/cmzlib/Copyright.txt)0
8 files changed, 4 insertions, 5 deletions
diff --git a/doc/cmake-3.2/Copyright.txt b/doc/cmake-3.5/Copyright.txt
index 6c9fb09..f99998f 100644
--- a/doc/cmake-3.2/Copyright.txt
+++ b/doc/cmake-3.5/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.5/cmcompress/Copyright.txt
index 162332f..162332f 100644
--- a/doc/cmake-3.2/cmcompress/Copyright.txt
+++ b/doc/cmake-3.5/cmcompress/Copyright.txt
diff --git a/doc/cmake-3.2/cmcurl/COPYING b/doc/cmake-3.5/cmcurl/COPYING
index dd990b6..6b5d59f 100644
--- a/doc/cmake-3.2/cmcurl/COPYING
+++ b/doc/cmake-3.5/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/cmexpat/COPYING b/doc/cmake-3.5/cmexpat/COPYING
index fc97b02..fc97b02 100644
--- a/doc/cmake-3.2/cmexpat/COPYING
+++ b/doc/cmake-3.5/cmexpat/COPYING
diff --git a/doc/cmake-3.2/cmlibarchive/COPYING b/doc/cmake-3.5/cmlibarchive/COPYING
index b258806..93952b7 100644
--- a/doc/cmake-3.2/cmlibarchive/COPYING
+++ b/doc/cmake-3.5/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.5/cmliblzma/COPYING
index 43c90d0..43c90d0 100644
--- a/doc/cmake-3.2/cmliblzma/COPYING
+++ b/doc/cmake-3.5/cmliblzma/COPYING
diff --git a/doc/cmake-3.2/cmsys/Copyright.txt b/doc/cmake-3.5/cmsys/Copyright.txt
index 1549a7d..1549a7d 100644
--- a/doc/cmake-3.2/cmsys/Copyright.txt
+++ b/doc/cmake-3.5/cmsys/Copyright.txt
diff --git a/doc/cmake-3.2/cmzlib/Copyright.txt b/doc/cmake-3.5/cmzlib/Copyright.txt
index db0beae..db0beae 100644
--- a/doc/cmake-3.2/cmzlib/Copyright.txt
+++ b/doc/cmake-3.5/cmzlib/Copyright.txt