Changeset 8e419cb for protocols/oscar/oscar.c

Timestamp:

2006-01-10T21:35:08Z (19 years ago)

Author:

Jelmer Vernooij <jelmer@…>

Branches:

master

Children:

a4dc9f7

Parents:

3e91c3e (diff), dd8d4c5 (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:

Merge Wilmer

File:

• protocols/oscar/oscar.c (modified) (2 diffs)

protocols/oscar/oscar.c

@@ -21 +21 @@
  */
 
-#include "sock.h"
 #include <errno.h>
 #include <ctype.h>
@@ -33 +32 @@
 #include "bitlbee.h"
 #include "proxy.h"
+#include "sock.h"
 
 #include "aim.h"