diff --git a/AUTHORS b/AUTHORS index c0fbbee..5747e61 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1 +1,111 @@ Baptiste Lepilleur + +Aaron Jacobs +Aaron Jacobs +Adam Boseley +Adam Boseley +Aleksandr Derbenev <13alexac@gmail.com> +Alexander Gazarov +Alexander V. Brezgin +Alexandr Brezgin +Alexey Kruchinin +Anton Indrawan +Baptiste Jonglez +Baptiste Lepilleur +Baruch Siach +Ben Boeckel +Benjamin Knecht +Bernd Kuhls +Billy Donahue +Braden McDorman +Brandon Myers +Brendan Drew +chason +Chris Gilling +Christopher Dawes +Christopher Dunn +Chuck Atkins +Cody P Schafer +Connor Manning +Cory Quammen +Cristóvão B da Cruz e Silva +Daniel Krügler +Dani-Hub +Dan Liu +datadiode +datadiode +David Seifert +David West +dawesc +Dmitry Marakasov +dominicpezzuto +Don Milham +drgler +ds283 +Egor Tensin +eightnoteight +Evince +filipjs +findblar +Florian Meier +Gaëtan Lehmann +Gaurav +Gergely Nagy +Gida Pataki +I3ck +Iñaki Baz Castillo +Jacco +Jean-Christophe Fillion-Robin +Jonas Platte +Jörg Krause +Keith Lea +Kevin Grant +Kirill V. Lyadvinsky +Kirill V. Lyadvinsky +Kobi Gurkan +Magnus Bjerke Vik +Malay Shah +Mara Kim +Marek Kotewicz +Mark Lakata +Mark Zeren +Martin Buck +Martyn Gigg +Mattes D +Matthias Loy +Merlyn Morgan-Graham +Michael Shields +Michał Górny +Mike Naberezny +mloy +Motti +nnkur +Omkar Wagh +paulo +pavel.pimenov +Paweł Bylica +Péricles Lopes Machado +Peter Spiess-Knafl +pffang +Rémi Verschelde +renu555 +Robert Dailey +Sam Clegg +selaselah +Sergiy80 +sergzub +Stefan Schweter +Steffen Kieß +Steven Hahn +Stuart Eichert +SuperManitu +Techwolf +Tengiz Sharafiev +Tomasz Maciejewski +Vicente Olivert Riera +xiaoyur347 +ycqiu <429148848@qq.com> +yiqiju +Yu Xiaolei + +Google Inc. diff --git a/LICENSE b/LICENSE index ca2bfe1..55a3b2d 100644 --- a/LICENSE +++ b/LICENSE @@ -2,12 +2,12 @@ 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 +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 +2010), this software is Copyright (c) 2007-2010 by 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 @@ -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 The JsonCpp Authors Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff --git a/devtools/__init__.py b/devtools/__init__.py index d18a521..90b4fd7 100644 --- a/devtools/__init__.py +++ b/devtools/__init__.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/antglob.py b/devtools/antglob.py index c272f66..75615ed 100644 --- a/devtools/antglob.py +++ b/devtools/antglob.py @@ -1,6 +1,6 @@ #!/usr/bin/env python # encoding: utf-8 -# Copyright 2009 Baptiste Lepilleur +# Copyright 2009 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/fixeol.py b/devtools/fixeol.py index b55e146..e089f9f 100644 --- a/devtools/fixeol.py +++ b/devtools/fixeol.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/licenseupdater.py b/devtools/licenseupdater.py index 6f82361..43ddb4f 100644 --- a/devtools/licenseupdater.py +++ b/devtools/licenseupdater.py @@ -6,7 +6,7 @@ from __future__ import print_function # and ends with the first blank line. LICENSE_BEGIN = "// Copyright " -BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur +BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors // Distributed under MIT license, or public domain if desired and // recognized in your jurisdiction. // See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/devtools/tarball.py b/devtools/tarball.py index 2e72717..ce36594 100644 --- a/devtools/tarball.py +++ b/devtools/tarball.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/makerelease.py b/makerelease.py index ea3722d..6f9a2f2 100644 --- a/makerelease.py +++ b/makerelease.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/globtool.py b/scons-tools/globtool.py index 890f1b7..1aa73fc 100644 --- a/scons-tools/globtool.py +++ b/scons-tools/globtool.py @@ -1,4 +1,4 @@ -# Copyright 2009 Baptiste Lepilleur +# Copyright 2009 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/srcdist.py b/scons-tools/srcdist.py index fe1d746..3c9b141 100644 --- a/scons-tools/srcdist.py +++ b/scons-tools/srcdist.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/substinfile.py b/scons-tools/substinfile.py index c620442..5d235e7 100644 --- a/scons-tools/substinfile.py +++ b/scons-tools/substinfile.py @@ -1,4 +1,4 @@ -# Copyright 2010 Baptiste Lepilleur +# Copyright 2010 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/scons-tools/targz.py b/scons-tools/targz.py index 8e5ba83..9e2e8d4 100644 --- a/scons-tools/targz.py +++ b/scons-tools/targz.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/cleantests.py b/test/cleantests.py index 9772d54..6a441dc 100644 --- a/test/cleantests.py +++ b/test/cleantests.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/generate_expected.py b/test/generate_expected.py index 0b74f51..4d56bce 100644 --- a/test/generate_expected.py +++ b/test/generate_expected.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/pyjsontestrunner.py b/test/pyjsontestrunner.py index 7f38356..6111ea9 100644 --- a/test/pyjsontestrunner.py +++ b/test/pyjsontestrunner.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/runjsontests.py b/test/runjsontests.py index d21c02f..d0c9386 100644 --- a/test/runjsontests.py +++ b/test/runjsontests.py @@ -1,4 +1,4 @@ -# Copyright 2007 Baptiste Lepilleur +# Copyright 2007 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE diff --git a/test/rununittests.py b/test/rununittests.py index 08850ec..cffe2c7 100644 --- a/test/rununittests.py +++ b/test/rununittests.py @@ -1,4 +1,4 @@ -# Copyright 2009 Baptiste Lepilleur +# Copyright 2009 The JsonCpp Authors # Distributed under MIT license, or public domain if desired and # recognized in your jurisdiction. # See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE