Mercurial > pidgin
diff COPYRIGHT @ 17262:8a7238fb7905
explicit merge of 'dc4f2ee34039521ae6a198fe7d62f4dca8a84589'
and '9d8bc74c7c13474edcefafedd0af9020b27c9a2f'
author | Jeffrey Connelly <jaconnel@calpoly.edu> |
---|---|
date | Wed, 30 May 2007 02:56:25 +0000 |
parents | ca69d4253246 840b0730b3c2 |
children | 9a1c7a566d7c |
line wrap: on
line diff
--- a/COPYRIGHT Wed May 23 04:18:05 2007 +0000 +++ b/COPYRIGHT Wed May 30 02:56:25 2007 +0000 @@ -17,6 +17,7 @@ Christopher Ayoup Alex Badea John Bailey +R. Tyler Ballance Chris Banal Luca Barbato Levi Bard @@ -73,6 +74,7 @@ Eoin Coffey Jason Cohen Todd Cohen +Graham Cole Jono Cole Lorenzo Colitti Jeff Connelly @@ -85,7 +87,9 @@ Palmer Cox Jeramey Crawford Michael Culbertson +Steven Danna Martijn Dekker +Vinicius Depizzol Philip Derrin Taso N. Devetzis Balwinder Singh Dheeman @@ -159,6 +163,7 @@ Nigel Horne Jensen Hornick Juanjo Molinero Horno +Dustin Howett Nathanael Hoyle Greg Hudson Magnus Hult @@ -168,6 +173,7 @@ Thomas Huriaux Instant Messaging Freedom, Inc. Vitaliy Ischenko +Intel Corporation Scott Jackson Hans Petter Jansson Henry Jen @@ -300,6 +306,7 @@ David Schmitt Mark Schneider Evan Schoenberg +Gabriel Schulhof Federico Schwindt Torrey Searle Peter Seebach @@ -319,6 +326,7 @@ Phil Snowberger Eddie Sohn (tr1sk) Sony Computer Entertainment America, Inc. +Andy Spencer Mark Spencer Lex Spoon Chris Stafford @@ -351,11 +359,13 @@ Junichi Uekawa István Váradi Martijn van Beers +Arjan van de Ven Philip Van Hoof Kristof Vansant James Vega David Vermeille Sid Vicious +Jorge Villaseñor (Masca) Bjoern Voigt Wan Hing Wah Philip Walford