diff options
| author | Brad King <brad.king@kitware.com> | 2014-10-08 16:30:41 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-10-29 16:43:21 -0400 |
| commit | 80c881f7938969dab169f4fc4fbf8bc3d4355fc2 (patch) | |
| tree | 77abe643bf8fcb388056480350b99b666f543965 /Utilities/cmcurl/COPYING | |
| parent | ff67d2b57946a29e18d1947efe71f26ece9e1747 (diff) | |
| parent | 3fe5d9bff98b4716e219516c30d71462495324f4 (diff) | |
| download | cmake-80c881f7938969dab169f4fc4fbf8bc3d4355fc2.tar.gz | |
Merge branch 'curl-upstream' into update-curl
Resolve all conflicts in favor of the upstream side.
We can re-apply specific changes later.
Diffstat (limited to 'Utilities/cmcurl/COPYING')
| -rw-r--r-- | Utilities/cmcurl/COPYING | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Utilities/cmcurl/COPYING b/Utilities/cmcurl/COPYING index 048cf5657d..dd990b6a6c 100644 --- a/Utilities/cmcurl/COPYING +++ b/Utilities/cmcurl/COPYING @@ -1,6 +1,6 @@ COPYRIGHT AND PERMISSION NOTICE -Copyright (c) 1996 - 2009, Daniel Stenberg, <daniel@haxx.se>. +Copyright (c) 1996 - 2014, Daniel Stenberg, <daniel@haxx.se>. All rights reserved. |