Mercurial > pidgin
changeset 16845:25338643b420
merge of '3e5e8d1aaf2c505b4a94800d8fae315582920517'
and 'c5e69cd6bfe3af1f52193d24c9190dec511bf63a'
| author | Casey Harkins <charkins@pidgin.im> |
|---|---|
| date | Thu, 03 May 2007 23:01:25 +0000 |
| parents | f4bebd09c671 (current diff) b05f0afdc8f1 (diff) |
| children | 30ab55257a16 |
| files | |
| diffstat | 2 files changed, 9 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Thu May 03 22:47:04 2007 +0000 +++ b/AUTHORS Thu May 03 23:01:25 2007 +0000 @@ -17,14 +17,15 @@ Jabber: seanegn@jabber.org Gadu-Gadu: 1511497 -Daniel 'datallah' Atallah +Daniel 'datallah' Atallah - Developer Ethan 'Paco-Paco' Blanton - Developer Thomas Butter - Developer Sadrul Habib Chowdhury - Developer Mark 'KingAnt' Doliner - Developer Christian 'ChipX86' Hammond - Developer & Webmaster Gary 'grim' Kramlich - Developer -Richard 'rlaager' Laager +Richard 'rlaager' Laager - Developer +Richard 'wabz' Nelson - Developer Christopher 'siege' O'Brien - Developer Bartosz Oler - Developer Etan 'deryni' Reisner - Developer @@ -37,9 +38,11 @@ Crazy Patch Writers: ------------------- +John 'rekkanoryo' Bailey Ka-Hing 'javabsp' Cheung Felipe 'shx' Contreras Decklin Foster +Casey Harkins Peter 'Bleeter' Lawler Robert 'Robot101' McQueen Benjamin Miller
--- a/doc/pidgin.1.in Thu May 03 22:47:04 2007 +0000 +++ b/doc/pidgin.1.in Thu May 03 23:01:25 2007 +0000 @@ -548,6 +548,8 @@ .br Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR> .br + Richard 'wabz' Nelson (developer) +.br Christopher 'siege' O'Brien (developer) .br Bartosz Oler (developer) @@ -574,12 +576,12 @@ .br Ka-Hing 'javabsp' Cheung .br -Sadrul Habib Chowdhury -.br Felipe 'shx' Contreras .br Decklin Foster .br +Casey Harkins +.br Peter 'Bleeter' Lawler .br Robert 'Robot101' McQueen