Mercurial > pidgin
diff COPYRIGHT @ 17646:c77daec18cbd
merge of '1703086ea650a3935367b62177a03abe60471328'
and 'fe24c1a20aadfd9b2a250a118516473028172233'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Mon, 18 Jun 2007 02:34:17 +0000 |
parents | 9a1c7a566d7c |
children | eeaf5afc8940 |
line wrap: on
line diff
--- a/COPYRIGHT Mon Jun 18 02:34:10 2007 +0000 +++ b/COPYRIGHT Mon Jun 18 02:34:17 2007 +0000 @@ -8,6 +8,7 @@ Dave Ahlswede Manuel Amador Matt Amato +Elliott Sales de Andrade Geoffrey Antos Daniel Atallah Paul Aurich @@ -88,6 +89,7 @@ Jeramey Crawford Michael Culbertson Steven Danna +Chris Davies Martijn Dekker Vinicius Depizzol Philip Derrin @@ -129,6 +131,7 @@ Decklin Foster Francesco Fracassi Adam Fritzler +Takao Fujiwara Max G. François Gagné Andrew Gaul @@ -149,6 +152,7 @@ Casey Harkins Andy Harrison Andrew Hart (arhart) +Rene Hausleitner G. Sumner Hayes Michael R. Head Nick Hebner @@ -222,6 +226,7 @@ Lalo Martins John Matthews Simo Mattila +Michal Matyska Ryan McCabe Peter McCurdy Kurt McKee @@ -334,8 +339,10 @@ Richard Stellingwerff Charlie Stockman David Stoddard +Oleg Sukhodolsky Sun Microsystems Mårten Svantesson (fursten) +Amir Szekely (kichik) Robert T. Greg Taeger Peter Tang