Ignore:
Timestamp:
2010-05-09T09:48:56Z (11 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
e5abfd4
Parents:
75610c3 (diff), 5a599a1 (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 mainline, mostly for chatroom fixes I implemented there.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/oscar/oscar.c

    r75610c3 rbd5eee3  
    26592659       
    26602660        c = imcb_chat_new(ic, chatname);
    2661 
    26622661        ret = oscar_chat_join(ic, chatname, NULL, NULL);
    2663 
    26642662        aim_chat_invite(od->sess, od->conn, who, "", 4, chatname, 0x0);
    26652663
Note: See TracChangeset for help on using the changeset viewer.