summaryrefslogtreecommitdiff
path: root/COPYRIGHT
diff options
context:
space:
mode:
authorVivien Bernet-Rollande <scrouaf@soc.pidgin.im>2008-07-19 17:45:27 +0000
committerVivien Bernet-Rollande <scrouaf@soc.pidgin.im>2008-07-19 17:45:27 +0000
commit3da512097dc02b58a5683465ed3165ee9038de7b (patch)
tree865d785b350668e15a3ef36954af0128cc92fe65 /COPYRIGHT
parentc498dbafcafb84da13f08000e52dc7c2f68f4e38 (diff)
parent0f4a924ac8b5b926e57d078a9b114b3e61fc5677 (diff)
downloadpidgin-3da512097dc02b58a5683465ed3165ee9038de7b.tar.gz
propagate from branch 'im.pidgin.pidgin' (head dc77ee83fe8dd877daae0019926ee40dd6b9b0ac)
to branch 'im.pidgin.soc.2008.masterpassword' (head ff88d1340abeb30db8368db451aed2c3a9cb44a1)
Diffstat (limited to 'COPYRIGHT')
-rw-r--r--COPYRIGHT5
1 files changed, 4 insertions, 1 deletions
diff --git a/COPYRIGHT b/COPYRIGHT
index ccad669dc8..1f52cb97a7 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -8,7 +8,6 @@ Saleem Abdulrasool
Dave Ahlswede
Manuel Amador
Matt Amato
-Elliott Sales de Andrade
Geoffrey Antos
Daniel Atallah
Paul Aurich
@@ -50,6 +49,7 @@ Craig Boston
Chris Boyle
Derrick J Brashear
Mauro Sérgio Ferreira Brasil
+Luke Bratch
Matt Brenneke
Jeremy Brooks
Jonathan Brossard
@@ -162,6 +162,7 @@ Gideon N. Guillen
Christian Hammond
Erick Hamness
Fred Hampton
+Phil Hannent
Casey Harkins
Andy Harrison
Andrew Hart (arhart)
@@ -229,6 +230,7 @@ Nicolas Lichtmaier
Wesley Lin
Artem Litvinovich
Josh Littlefield
+Daniel Ljungborg
Syd Logan
Lokheed
Norberto Lopes
@@ -339,6 +341,7 @@ Peter Ruibal
Michael Ruprecht
Sam S.
Thanumalayan S.
+Elliott Sales de Andrade
Tomasz Sałaciński <tsalacinski@gmail.com>
Pradyumna Sampath
Arvind Samptur