Ignore:
Timestamp:
2010-10-09T18:41:19Z (14 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
d150a9d
Parents:
23b29c6 (diff), 27b407f (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:

Merging OTR branch. It's more or less a plugin if you enable it, and
otherwise a no-op. DO NOT INSTALL THIS ON PUBLIC SERVERS.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    r23b29c6 r6197702  
    26122612        struct prpl *ret = g_new0(struct prpl, 1);
    26132613        ret->name = "oscar";
     2614    ret->mms = 2343;       /* this guess taken from libotr UPGRADING file */
    26142615        ret->away_states = oscar_away_states;
    26152616        ret->init = oscar_init;
Note: See TracChangeset for help on using the changeset viewer.