Skip to content

Commit a3d35d7

Browse files
cdunn2001cdunn2001
authored
Merge pull request #607 from ssbr/master
Refactor authorship information for more technical accuracy.
2 parents acf7429 + 19fc55f commit a3d35d7

17 files changed

+128
-18
lines changed

Diff for: ‎AUTHORS

+110
Original file line numberDiff line numberDiff line change
@@ -1 +1,111 @@
11
Baptiste Lepilleur <blep@users.sourceforge.net>
2+
3+
Aaron Jacobs <aaronjjacobs@gmail.com>
4+
Aaron Jacobs <jacobsa@google.com>
5+
Adam Boseley <ABoseley@agjunction.com>
6+
Adam Boseley <adam.boseley@gmail.com>
7+
Aleksandr Derbenev <13alexac@gmail.com>
8+
Alexander Gazarov <DrMetallius@users.noreply.github.com>
9+
Alexander V. Brezgin <abrezgin@appliedtech.ru>
10+
Alexandr Brezgin <albrezgin@mail.ru>
11+
Alexey Kruchinin <alexey@mopals.com>
12+
Anton Indrawan <anton.indrawan@gmail.com>
13+
Baptiste Jonglez <git@bitsofnetworks.org>
14+
Baptiste Lepilleur <baptiste.lepilleur@gmail.com>
15+
Baruch Siach <baruch@tkos.co.il>
16+
Ben Boeckel <mathstuf@gmail.com>
17+
Benjamin Knecht <bknecht@logitech.com>
18+
Bernd Kuhls <bernd.kuhls@t-online.de>
19+
Billy Donahue <billydonahue@google.com>
20+
Braden McDorman <bmcdorman@gmail.com>
21+
Brandon Myers <bmyers1788@gmail.com>
22+
Brendan Drew <brendan.drew@daqri.com>
23+
chason <cxchao802@gmail.com>
24+
Chris Gilling <cgilling@iparadigms.com>
25+
Christopher Dawes <christopher.dawes.1981@googlemail.com>
26+
Christopher Dunn <cdunn2001@gmail.com>
27+
Chuck Atkins <chuck.atkins@kitware.com>
28+
Cody P Schafer <dev@codyps.com>
29+
Connor Manning <connor@hobu.co>
30+
Cory Quammen <cory.quammen@kitware.com>
31+
Cristóvão B da Cruz e Silva <CrisXed@gmail.com>
32+
Daniel Krügler <daniel.kruegler@gmail.com>
33+
Dani-Hub <daniel.kruegler@googlemail.com>
34+
Dan Liu <gzliudan>
35+
datadiode <datadiode@users.noreply.github.com>
36+
datadiode <jochen.neubeck@vodafone.de>
37+
David Seifert <soap@gentoo.org>
38+
David West <david-west@idexx.com>
39+
dawesc <chris.dawes@eftlab.co.uk>
40+
Dmitry Marakasov <amdmi3@amdmi3.ru>
41+
dominicpezzuto <dom@dompezzuto.com>
42+
Don Milham <dmilham@gmail.com>
43+
drgler <daniel.kruegler@gmail.com>
44+
ds283 <D.Seery@sussex.ac.uk>
45+
Egor Tensin <Egor.Tensin@gmail.com>
46+
eightnoteight <mr.eightnoteight@gmail.com>
47+
Evince <baneyue@gmail.com>
48+
filipjs <filipjs@users.noreply.github.com>
49+
findblar <ft@finbarr.ca>
50+
Florian Meier <florian.meier@koalo.de>
51+
Gaëtan Lehmann <gaetan.lehmann@gmail.com>
52+
Gaurav <g.gupta@samsung.com>
53+
Gergely Nagy <ngg@ngg.hu>
54+
Gida Pataki <gida.pataki@prezi.com>
55+
I3ck <buckmartin@buckmartin.de>
56+
Iñaki Baz Castillo <ibc@aliax.net>
57+
Jacco <jacco@geul.net>
58+
Jean-Christophe Fillion-Robin <jchris.fillionr@kitware.com>
59+
Jonas Platte <mail@jonasplatte.de>
60+
Jörg Krause <joerg.krause@embedded.rocks>
61+
Keith Lea <keith@whamcitylights.com>
62+
Kevin Grant <kbradleygrant@gmail.com>
63+
Kirill V. Lyadvinsky <jia3ep@gmail.com>
64+
Kirill V. Lyadvinsky <mail@codeatcpp.com>
65+
Kobi Gurkan <kobigurk@gmail.com>
66+
Magnus Bjerke Vik <mbvett@gmail.com>
67+
Malay Shah <malays@users.sourceforge.net>
68+
Mara Kim <hacker.root@gmail.com>
69+
Marek Kotewicz <marek.kotewicz@gmail.com>
70+
Mark Lakata <mark@lakata.org>
71+
Mark Zeren <mzeren@vmware.com>
72+
Martin Buck <buckmartin@buckmartin.de>
73+
Martyn Gigg <martyn.gigg@gmail.com>
74+
Mattes D <github@xoft.cz>
75+
Matthias Loy <matthias.loy@hbm.com>
76+
Merlyn Morgan-Graham <kavika@gmail.com>
77+
Michael Shields <mshields@google.com>
78+
Michał Górny <mgorny@gentoo.org>
79+
Mike Naberezny <mike@naberezny.com>
80+
mloy <matthias.loy@googlemail.com>
81+
Motti <lanzkron@gmail.com>
82+
nnkur <nnkur@mail.ru>
83+
Omkar Wagh <owagh@owaghlinux.ny.tower-research.com>
84+
paulo <paulobrizolara@users.noreply.github.com>
85+
pavel.pimenov <pavel.pimenov@gmail.com>
86+
Paweł Bylica <chfast@gmail.com>
87+
Péricles Lopes Machado <pericles.raskolnikoff@gmail.com>
88+
Peter Spiess-Knafl <psk@autistici.org>
89+
pffang <pffang@vip.qq.com>
90+
Rémi Verschelde <remi@verschelde.fr>
91+
renu555 <renu.tyagi@samsung.com>
92+
Robert Dailey <rcdailey@gmail.com>
93+
Sam Clegg <sbc@chromium.org>
94+
selaselah <selah@outlook.com>
95+
Sergiy80 <sil2004@gmail.com>
96+
sergzub <sergzub@gmail.com>
97+
Stefan Schweter <stefan@schweter.it>
98+
Steffen Kieß <Steffen.Kiess@ipvs.uni-stuttgart.de>
99+
Steven Hahn <hahnse@ornl.gov>
100+
Stuart Eichert <stuart@fivemicro.com>
101+
SuperManitu <supermanitu@gmail.com>
102+
Techwolf <dring@g33kworld.net>
103+
Tengiz Sharafiev <btolfa+github@gmail.com>
104+
Tomasz Maciejewski <tmaciejewsk@gmail.com>
105+
Vicente Olivert Riera <Vincent.Riera@imgtec.com>
106+
xiaoyur347 <xiaoyur347@gmail.com>
107+
ycqiu <429148848@qq.com>
108+
yiqiju <fred_ju@selinc.com>
109+
Yu Xiaolei <dreifachstein@gmail.com>
110+
111+
Google Inc.

Diff for: ‎LICENSE

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,12 @@ The JsonCpp library's source code, including accompanying documentation,
22
tests and demonstration applications, are licensed under the following
33
conditions...
44

5-
The author (Baptiste Lepilleur) explicitly disclaims copyright in all
5+
The JsonCpp Authors explicitly disclaim copyright in all
66
jurisdictions which recognize such a disclaimer. In such jurisdictions,
77
this software is released into the Public Domain.
88

99
In jurisdictions which do not recognize Public Domain property (e.g. Germany as of
10-
2010), this software is Copyright (c) 2007-2010 by Baptiste Lepilleur, and is
10+
2010), this software is Copyright (c) 2007-2010 by The JsonCpp Authors, and is
1111
released under the terms of the MIT License (see below).
1212

1313
In jurisdictions which recognize Public Domain property, the user of this
@@ -23,7 +23,7 @@ described in clear, concise terms at:
2323
The full text of the MIT License follows:
2424

2525
========================================================================
26-
Copyright (c) 2007-2010 Baptiste Lepilleur
26+
Copyright (c) 2007-2010 The JsonCpp Authors
2727

2828
Permission is hereby granted, free of charge, to any person
2929
obtaining a copy of this software and associated documentation

Diff for: ‎devtools/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎devtools/antglob.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#!/usr/bin/env python
22
# encoding: utf-8
3-
# Copyright 2009 Baptiste Lepilleur
3+
# Copyright 2009 The JsonCpp Authors
44
# Distributed under MIT license, or public domain if desired and
55
# recognized in your jurisdiction.
66
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎devtools/fixeol.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎devtools/licenseupdater.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# and ends with the first blank line.
77
LICENSE_BEGIN = "// Copyright "
88

9-
BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 Baptiste Lepilleur
9+
BRIEF_LICENSE = LICENSE_BEGIN + """2007-2010 The JsonCpp Authors
1010
// Distributed under MIT license, or public domain if desired and
1111
// recognized in your jurisdiction.
1212
// See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎devtools/tarball.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎makerelease.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎scons-tools/globtool.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009 Baptiste Lepilleur
1+
# Copyright 2009 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎scons-tools/srcdist.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎scons-tools/substinfile.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2010 Baptiste Lepilleur
1+
# Copyright 2010 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎scons-tools/targz.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎test/cleantests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎test/generate_expected.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎test/pyjsontestrunner.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎test/runjsontests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2007 Baptiste Lepilleur
1+
# Copyright 2007 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

Diff for: ‎test/rununittests.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright 2009 Baptiste Lepilleur
1+
# Copyright 2009 The JsonCpp Authors
22
# Distributed under MIT license, or public domain if desired and
33
# recognized in your jurisdiction.
44
# See file LICENSE for detail or copy at http://jsoncpp.sourceforge.net/LICENSE

0 commit comments

Comments
 (0)