diff options
| author | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-24 00:12:24 +0100 |
|---|---|---|
| committer | Wilmer van der Gaast <wilmer@gaast.net> | 2010-08-24 00:12:24 +0100 |
| commit | be999a5385ff4e9ac7416de4cca3288f18cee85c (patch) | |
| tree | ddd6a6e256719c378e9748e0d96791e11844f659 /root_commands.c | |
| parent | 237eadd361a7ed1d2a49180056d12b57f6f3cc0a (diff) | |
| parent | eb6df6a280c458546ebc57126e63a828674b4cd8 (diff) | |
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).
Diffstat (limited to 'root_commands.c')
| -rw-r--r-- | root_commands.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/root_commands.c b/root_commands.c index 280c93a2..baad826d 100644 --- a/root_commands.c +++ b/root_commands.c @@ -28,6 +28,7 @@ #include "bitlbee.h" #include "help.h" #include "ipc.h" +#include "otr.h" void root_command_string( irc_t *irc, char *command ) { @@ -1338,6 +1339,7 @@ const command_t commands[] = { { "identify", 1, cmd_identify, 0 }, { "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 }, { "remove", 1, cmd_remove, 0 }, |