Changeset be999a5 for protocols/yahoo


Ignore:
Timestamp:
2010-08-23T23:12:24Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ad2d8bc
Parents:
237eadd (diff), eb6df6a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/yahoo/yahoo.c

    r237eadd rbe999a5  
    379379        struct prpl *ret = g_new0(struct prpl, 1);
    380380        ret->name = "yahoo";
     381    ret->mms = 832;           /* this guess taken from libotr UPGRADING file */
    381382        ret->init = byahoo_init;
    382383       
Note: See TracChangeset for help on using the changeset viewer.