Ignore:
Timestamp:
2015-04-06T17:07:03Z (6 years ago)
Author:
dequis <dx@…>
Children:
1aacef41
Parents:
b3ebb3a (diff), a9b1e0e (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:

Merge branch 'develop' into feat/hip-cat

Conflicts:

irc.h
irc_channel.c

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/msn/msn.c

    rb3ebb3a r0fb32dd  
    9696
    9797        if (md) {
    98                 /** Disabling MSN ft support for now.
    99                 while( md->filetransfers ) {
    100                         imcb_file_canceled( md->filetransfers->data, "Closing connection" );
    101                 }
    102                 */
    103 
    10498                msn_ns_close(md->ns);
    10599
     
    470464        ret->buddy_action = msn_buddy_action;
    471465
    472         //ret->transfer_request = msn_ftp_transfer_request;
    473 
    474466        register_protocol(ret);
    475467}
Note: See TracChangeset for help on using the changeset viewer.