changeset
merge of '58661da65e36faef48264051a11ee337521b25d5'
Sat, 10 May 2008 05:20:29 +0000
- author
- Kevin Stange <kstange@pidgin.im>
- date
- Sat, 10 May 2008 05:20:29 +0000
- changeset 23045
- be2a6f2437b4
- parent 23041
- 58661da65e36 (current diff)
- parent 23043
- 41ef19e8a621 (diff)
- child 23046
- ee4dfa45f5fc
merge of '58661da65e36faef48264051a11ee337521b25d5'
and '41ef19e8a621dbba884072c4c6952fbd4ef6c149'
--- 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} };
