Mercurial > pidgin

diff COPYRIGHT @ 20407:1122d47583a1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
explicit merge of 'd42ad2da81f881b2fbd2fb080cc70a843bc70d02' and '8582c561c020d2d1e8d358e2e7cd9e3da113ed9e' to branch 'im.pidgin.cpw.khc.msnp14'
author Ka-Hing Cheung <khc@hxbc.us>
date Wed, 02 May 2007 05:25:27 +0000
parents 70b48f559312
children 58a097859388
line wrap: on
line diff
--- a/COPYRIGHT	Sun Apr 15 20:12:06 2007 +0000
+++ b/COPYRIGHT	Wed May 02 05:25:27 2007 +0000
@@ -1,4 +1,4 @@
-Purple, Pidgin and Finch
+Pidgin, Finch, and libpurple
 Copyright (C) 1998-2007 by the following:
 
 If you have contributed to this project then you deserve to be on this
@@ -14,6 +14,7 @@
 Patrick Aussems
 Anibal Avelar
 Ali Albazaz
+Christopher Ayoup
 Alex Badea
 John Bailey
 Chris Banal
@@ -154,6 +155,7 @@
 Iain Holmes
 Joshua Honeycutt
 Nigel Horne
+Jensen Hornick
 Juanjo Molinero Horno
 Nathanael Hoyle
 Greg Hudson
@@ -211,6 +213,7 @@
 Fidel Martinez
 Lalo Martins
 John Matthews
+Simo Mattila
 Ryan McCabe
 Peter McCurdy
 Kurt McKee