Merge common and util

2012-08-23 01:08:06 +01:00
parent 8b7975bdf3
commit 0fe70ce7d3
15 changed files with 91 additions and 142 deletions
--- a/src/jabber.c
+++ b/src/jabber.c
@@ -30,7 +30,7 @@
 #include "chat_log.h"
 #include "contact_list.h"
 #include "ui.h"
-#include "util.h"
+#include "common.h"
 #include "preferences.h"

 #define PING_INTERVAL 120000 // 2 minutes