Changeset be999a5 for root_commands.c


Ignore:
Timestamp:
2010-08-23T23:12:24Z (9 years ago)
Author:
Wilmer van der Gaast <wilmer@…>
Branches:
master
Children:
ad2d8bc
Parents:
237eadd (diff), eb6df6a (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:

First step in this merge. Mostly a bzr merge and then a cleanup of conflicts
and parts I want to/have to redo (because of ui-fix).

File:
1 edited

Legend:

Unmodified
Added
Removed
  • root_commands.c

    r237eadd rbe999a5  
    2929#include "help.h"
    3030#include "ipc.h"
     31#include "otr.h"
    3132
    3233void root_command_string( irc_t *irc, char *command )
     
    13391340        { "info",           1, cmd_info,           0 },
    13401341        { "no",             0, cmd_yesno,          0 },
     1342        { "otr",            1, cmd_otr,            0 },
    13411343        { "qlist",          0, cmd_qlist,          0 },
    13421344        { "register",       1, cmd_register,       0 },
Note: See TracChangeset for help on using the changeset viewer.