Mercurial > pidgin
changeset 22878:d214379806a5
merge of '5800923dc413a26c68576e06ea89148d645fa4a9'
and '9031d840e937ccce30f2565df8ffc0b290f513b8'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 10 May 2008 03:39:51 +0000 |
| parents | 4f6040bb6f7a (current diff) 395ced2d98cc (diff) |
| children | 780972e37f0c cc1020f9c67e |
| files | pidgin/gtkdialogs.c |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Sat May 10 03:32:58 2008 +0000 +++ b/AUTHORS Sat May 10 03:39:51 2008 +0000 @@ -45,6 +45,7 @@ Peter 'Fmoo' Ruibal Elliott 'QuLogic' Sales de Andrade Gabriel 'Nix' Schulhof +Jorge 'Masca' Villaseñor Retired Developers: ------------------
--- a/pidgin/gtkdialogs.c Sat May 10 03:32:58 2008 +0000 +++ b/pidgin/gtkdialogs.c Sat May 10 03:39:51 2008 +0000 @@ -102,6 +102,7 @@ {"Peter 'Fmoo' Ruibal", NULL, NULL}, {"Elliott 'QuLogic' Sales de Andrade", NULL, NULL}, {"Gabriel 'Nix' Schulhof", NULL, NULL}, + {"Jorge 'Masca' Villaseñor", NULL, NULL}, {NULL, NULL, NULL} };