Changeset 51a799e for irc.c

Timestamp:

2010-05-25T22:07:06Z (14 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

f60079b

Parents:

d25ebea (diff), ba7d16f (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 killerbee. (The non-libpurple stuff currently doesn't compile.)

File:

• irc.c (modified) (1 diff)

irc.c

@@ -27 +27 @@
 #include "bitlbee.h"
 #include "sock.h"
-#include "crypting.h"
 #include "ipc.h"
 #include "dcc.h"