Changeset be999a5 for protocols/jabber


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/jabber/jabber.c

    r237eadd rbe999a5  
    557557       
    558558        ret->name = "jabber";
     559    ret->mms = 0;                        /* no limit */
    559560        ret->login = jabber_login;
    560561        ret->init = jabber_init;
Note: See TracChangeset for help on using the changeset viewer.