summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorKa-Hing Cheung <khc@pidgin.im>2007-07-22 18:17:41 +0000
committerKa-Hing Cheung <khc@pidgin.im>2007-07-22 18:17:41 +0000
commit448f83a8ce4ef7fb5fe28cebb068710c72c83ca1 (patch)
tree7c7d11b325499d76742acb00ebe2ca1947afe849 /COPYRIGHT
parent2b00ef7363d246a230f911991b30484bea37e365 (diff)
parent2273820863074ae3236f1bb4c8fc05d11d756589 (diff)
downloadpidgin-448f83a8ce4ef7fb5fe28cebb068710c72c83ca1.tar.gz
propagate from branch 'im.pidgin.pidgin' (head 32bc19b8db8ba1adadf80dbfdf50b349cbb28dd7)
to branch 'im.pidgin.cpw.khc.msnp14' (head fa644b8ae0687006c678ca19088c57ad2931cf87)
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT4
1 files changed, 4 insertions, 0 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index 52e2571783..4f2b87f98d 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -48,6 +48,7 @@ Julien Bossart
Craig Boston
Chris Boyle
Derrick J Brashear
+Mauro Sérgio Ferreira Brasil
Matt Brenneke
Jeremy Brooks
Jonathan Brossard
@@ -155,6 +156,7 @@ Casey Harkins
Andy Harrison
Andrew Hart (arhart)
Rene Hausleitner
+Will Hawkins
G. Sumner Hayes
Michael R. Head
Nick Hebner
@@ -322,6 +324,7 @@ Peter Seebach
Don Seiler
Leonardo Serra
Jim Seymour
+Javeed Shaikh
Joe Shaw
Scott Shedden
Dossy Shiobara
@@ -370,6 +373,7 @@ Tom Tromey
Todd Troxell
Brad Turcotte
Junichi Uekawa
+Igor Vlasenko
István Váradi
Martijn van Beers
Arjan van de Ven