Mercurial > pidgin
diff pidgin/gtkdialogs.c @ 22878:d214379806a5
merge of '5800923dc413a26c68576e06ea89148d645fa4a9'
and '9031d840e937ccce30f2565df8ffc0b290f513b8'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sat, 10 May 2008 03:39:51 +0000 |
parents | 4f6040bb6f7a 395ced2d98cc |
children | 0bd86dae2734 |
line wrap: on
line diff
--- 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} };