Changeset be999a5 for root_commands.c

Timestamp:

2010-08-23T23:12:24Z (14 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:

• root_commands.c (modified) (2 diffs)

root_commands.c

@@ -29 +29 @@
 #include "help.h"
 #include "ipc.h"
+#include "otr.h"
 
 void root_command_string( irc_t *irc, char *command )
@@ -1339 +1340 @@
         { "info",           1, cmd_info,           0 },
         { "no",             0, cmd_yesno,          0 },
+        { "otr",            1, cmd_otr,            0 }, 
         { "qlist",          0, cmd_qlist,          0 },
         { "register",       1, cmd_register,       0 },