Mercurial > pidgin.yaz
changeset 21904:9b299228431c
merge of '05319fdf1db00660d0c169657ed1b08ff621e5c7'
and 'a654aa0d3c35e43c2f23b266100bfdb4d98e2d73'
| author | Will Thompson <will.thompson@collabora.co.uk> |
|---|---|
| date | Wed, 19 Dec 2007 11:31:37 +0000 |
| parents | 0abfc065cf77 (diff) d18dbd4d1e85 (current diff) |
| children | 2dafcbfc1556 |
| files | |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Wed Dec 19 09:18:39 2007 +0000 +++ b/AUTHORS Wed Dec 19 11:31:37 2007 +0000 @@ -35,6 +35,7 @@ Megan 'Cae' Schneider - support/QA Evan Schoenberg - Developer Kevin 'SimGuy' Stange - Developer & Webmaster +Will 'resiak' Thompson - Developer Stu 'nosnilmot' Tomlinson - Developer Nathan 'faceprint' Walp - Developer @@ -42,8 +43,8 @@ ------------------- Dennis 'EvilDennisR' Ristuccia Peter 'Fmoo' Ruibal +Elliott 'QuLogic' Sales de Andrade Gabriel 'Nix' Schulhof -Will 'resiak' Thompson Retired Developers: ------------------
--- a/doc/pidgin.1.in Wed Dec 19 09:18:39 2007 +0000 +++ b/doc/pidgin.1.in Wed Dec 19 11:31:37 2007 +0000 @@ -590,6 +590,8 @@ .br Kevin 'SimGuy' Stange (developer and webmaster) .br + Will 'resiak' Thompson (developer) +.br Stu 'nosnilmot' Tomlinson (developer) .br Nathan 'faceprint' Walp (developer) @@ -602,9 +604,9 @@ .br Peter 'fmoo' Ruibal .br - Gabriel 'Nix' Schulhof + Elliott 'QuLogic' Sales de Andrade .br - Will 'resiak' Thompson + Gabriel 'Nix' Schulhof .br
--- a/pidgin/gtkdialogs.c Wed Dec 19 09:18:39 2007 +0000 +++ b/pidgin/gtkdialogs.c Wed Dec 19 11:31:37 2007 +0000 @@ -99,8 +99,8 @@ static const struct developer patch_writers[] = { {"Dennis 'EvilDennisR' Ristuccia", N_("Senior Contributor/QA"), NULL}, {"Peter 'Fmoo' Ruibal", NULL, NULL}, + {"Elliott 'QuLogic' Sales de Andrade", NULL, NULL}, {"Gabriel 'Nix' Schulhof", NULL, NULL}, - {"Elliott Sales de Andrade", NULL, NULL}, {NULL, NULL, NULL} };