pidgin/pidgin

Merged pidgin/main into default

2017-03-23, Arkadiy Illarionov
0d588a4d383e
Parents c979362981fb107c6c2342ff
Children c1fb4e53da4e
Merged pidgin/main into default
3 files changed, 4 insertions(+), 4 deletions(-)
  • +1 -1
    AUTHORS
  • +2 -2
    doc/pidgin.1.in
  • +1 -1
    pidgin/gtkdialogs.c
    • --- a/AUTHORS Sat Mar 11 13:00:08 2017 +0300
    +++ b/AUTHORS Thu Mar 23 19:11:37 2017 +0300
    @@ -40,7 +40,7 @@
    Herman Bloggs - Win32 Port
    Thomas Butter - Developer
    Ka-Hing Cheung - Developer
    -Mark 'KingAnt' Doliner - Maintainer
    +Mark 'KingAnt' Doliner - maintainer
    Jim Duchek <jim@linuxpimps.com> - maintainer
    Sean Egan - Developer
    Rob Flynn <gaim@robflynn.com> - maintainer
    --- a/doc/pidgin.1.in Sat Mar 11 13:00:08 2017 +0300
    +++ b/doc/pidgin.1.in Thu Mar 23 19:11:37 2017 +0300
    @@ -611,8 +611,6 @@
    .br
    Sadrul Habib Chowdhury (developer)
    .br
    - Mark 'KingAnt' Doliner (developer) <\fIthekingant@users.sourceforge.net\fR>
    -.br
    Gary 'grim' Kramlich (developer)
    .br
    Richard 'rlaager' Laager (developer) <\fIrlaager@pidgin.im\fR>
    @@ -669,6 +667,8 @@
    .br
    Ka-Hing Cheung (developer)
    .br
    + Mark 'KingAnt' Doliner (developer) <\fIthekingant@users.sourceforge.net\fR>
    +.br
    Jim Duchek <\fIjim@linuxpimps.com\fR> (maintainer)
    .br
    Sean Egan (developer) <\fIseanegan@gmail.com\fR>
    --- a/pidgin/gtkdialogs.c Sat Mar 11 13:00:08 2017 +0300
    +++ b/pidgin/gtkdialogs.c Thu Mar 23 19:11:37 2017 +0300
    @@ -77,7 +77,6 @@
    {"Ethan 'Paco-Paco' Blanton", NULL, NULL},
    {"Hylke Bons", N_("artist"), "hylkebons@gmail.com"},
    {"Sadrul Habib Chowdhury", NULL, NULL},
    - {"Mark 'KingAnt' Doliner", NULL, "mark@kingant.net"},
    {"Gary 'grim' Kramlich", NULL, "grim@pidgin.im"},
    {"Richard 'rlaager' Laager", NULL, "rlaager@pidgin.im"},
    {"Marcus 'malu' Lundblad", NULL, NULL},
    @@ -113,6 +112,7 @@
    /* Translators: This is a person's name. For most languages we recommend
    not translating it. */
    {N_("Ka-Hing Cheung"), NULL, NULL},
    + {"Mark 'KingAnt' Doliner", NULL, "mark@kingant.net"},
    {"Jim Duchek", N_("maintainer"), "jim@linuxpimps.com"},
    {"Sean Egan", NULL, "sean.egan@gmail.com"},
    {"Rob Flynn", N_("maintainer"), NULL},