summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorGary Kramlich <grim@reaperworld.com>2017-11-03 01:22:04 -0500
committerGary Kramlich <grim@reaperworld.com>2017-11-03 01:22:04 -0500
commit042a4208b84bf9ab891737cb20658074356e4d2a (patch)
tree36a082d7e8e2d1f2350300334a7b34d1a572c70c /COPYRIGHT
parentc9eee7099cb794fbbe735e6ab84def9f2ac2c07c (diff)
parenteeb7e2ce538bb486e1f5222d838befae540d8872 (diff)
downloadpidgin-042a4208b84bf9ab891737cb20658074356e4d2a.tar.gz
Merged release-2.x.y into default
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT2
1 files changed, 2 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 998324c68d..5e1afee88c 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -292,6 +292,7 @@ Ivan Komarov
F.W. Kong
Konstantin Korikov
Cole Kowalski
+Daniel Kamil Kozar
Nikita Kozlov
Matt Kramer
Gary Kramlich
@@ -628,6 +629,7 @@ The Written Word, Inc.
Kevin Wu Won
Pui Lam Wong
Justin Wood
+David Woodhouse
Ximian
Ma Xuan
Yonas Yanfa