Changeset 81ee561 for irc.c


Ignore:
Timestamp:
2010-03-20T18:03:18Z (10 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
85693e6
Parents:
3330468 (diff), 0baed0d (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 head. Most changes are not so relevant because they're to IM
modules.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • irc.c

    r3330468 r81ee561  
    171171        s = set_add( &irc->set, "buddy_sendbuffer_delay", "200", set_eval_int, irc );
    172172        s = set_add( &irc->set, "charset", "utf-8", set_eval_charset, irc );
     173        s = set_add( &irc->set, "control_channel", irc->channel, set_eval_control_channel, irc );
    173174        s = set_add( &irc->set, "debug", "false", set_eval_bool, irc );
    174175        s = set_add( &irc->set, "default_target", "root", NULL, irc );
Note: See TracChangeset for help on using the changeset viewer.