Ignore:
Timestamp:
2011-10-21T03:00:54Z (13 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
e6b41b1
Parents:
6a45181 (diff), aea22cd (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:

Big merge from pesco, closing some OTR issues: #759, #824, #839, #830.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • protocols/purple/purple.c

    r6a45181 r3864c08  
    181181                        /** No way to talk to the user right now, invent one when
    182182                        this becomes important.
    183                         irc_usermsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
     183                        irc_rootmsg( acc->irc, "Setting with unknown type: %s (%d) Expect stuff to break..\n",
    184184                                     name, purple_account_option_get_type( o ) );
    185185                        */
Note: See TracChangeset for help on using the changeset viewer.