diff options
| author | Brad King <brad.king@kitware.com> | 2017-08-30 14:37:38 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-08-30 14:37:45 (GMT) |
| commit | 92923f4cf40a5dd305ec8e6dd2b1901d609d34e0 (patch) | |
| tree | 7f60ef7efe11359fbfe15d1c4025e3e1a03ba8b9 /Utilities/cmjsoncpp/LICENSE | |
| parent | fff28e30cd01a88b2e5f67db2aaf4c068f1bfc89 (diff) | |
| parent | 73ed503ed5ca76c5b05629a00ddc29d3549a48e8 (diff) | |
| download | CMake-92923f4cf40a5dd305ec8e6dd2b1901d609d34e0.zip CMake-92923f4cf40a5dd305ec8e6dd2b1901d609d34e0.tar.gz CMake-92923f4cf40a5dd305ec8e6dd2b1901d609d34e0.tar.bz2 | |
Merge topic 'update-jsoncpp'
73ed503e jsoncpp: Drop doxygen comments not recognized by Clang
1a2b62b1 jsoncpp: Add initialization to pacify scanbuild
c103a959 jsoncpp: Fix compilation on SunPro
0a0f7106 jsoncpp: Drop deprecation markup
e0981955 Merge branch 'upstream-jsoncpp' into update-jsoncpp
a7241206 jsoncpp: Update script to get jsoncpp 1.8.2
cb844d41 jsoncpp: Drop unnecessary files from source list
7c06d356 Merge branch 'upstream-jsoncpp' into update-jsoncpp
...
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1199
Diffstat (limited to 'Utilities/cmjsoncpp/LICENSE')
| -rw-r--r-- | Utilities/cmjsoncpp/LICENSE | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Utilities/cmjsoncpp/LICENSE b/Utilities/cmjsoncpp/LICENSE index ca2bfe1..89280a6 100644 --- a/Utilities/cmjsoncpp/LICENSE +++ b/Utilities/cmjsoncpp/LICENSE @@ -2,13 +2,13 @@ The JsonCpp library's source code, including accompanying documentation, tests and demonstration applications, are licensed under the following conditions... -The author (Baptiste Lepilleur) explicitly disclaims copyright in all +Baptiste Lepilleur and The JsonCpp Authors explicitly disclaim copyright in all jurisdictions which recognize such a disclaimer. In such jurisdictions, this software is released into the Public Domain. In jurisdictions which do not recognize Public Domain property (e.g. Germany as of -2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is -released under the terms of the MIT License (see below). +2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur and +The JsonCpp Authors, and is released under the terms of the MIT License (see below). In jurisdictions which recognize Public Domain property, the user of this software may choose to accept it either as 1) Public Domain, 2) under the @@ -23,7 +23,7 @@ described in clear, concise terms at: The full text of the MIT License follows: ======================================================================== -Copyright (c) 2007-2010 Baptiste Lepilleur +Copyright (c) 2007-2010 Baptiste Lepilleur and The JsonCpp Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation |