Mercurial > pidgin
changeset 22879:780972e37f0c
merge of '99687ce6fa955d1d32092992b65de140dc944ab0'
and 'd26b1eaa92aaac0a6de151a429c6b7a3bf5bd241'
| author | Kevin Stange <kevin@simguy.net> |
|---|---|
| date | Sat, 10 May 2008 05:20:29 +0000 |
| parents | e6674df4cbf1 (current diff) d214379806a5 (diff) |
| children | b08b3a01f0d6 |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/AUTHORS Sat May 10 05:15:58 2008 +0000 +++ b/AUTHORS Sat May 10 05:20:29 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 05:15:58 2008 +0000 +++ b/pidgin/gtkdialogs.c Sat May 10 05:20:29 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} };