# HG changeset patch
# User Stu Tomlinson <stu@nosnilmot.com>
# Date 1196000214 0
# Node ID b12d8d11d46ce9b53e5be47c0ffffeb0f86a6fa2
# Parent  c956aff707eb49155208997d97290bcdbe1047d7# Parent  6b10805d29bc3375da6cf8fb5d98a5303c736593
merge of '66d234740bd40b14ef7564f178d84ab82816d6e2'
     and '6e23cb6795a35692cf0f84fcea64a7c2748a9bad'

diff -r 6b10805d29bc -r b12d8d11d46c finch/libgnt/gnt.h
--- a/finch/libgnt/gnt.h	Sun Nov 25 14:12:35 2007 +0000
+++ b/finch/libgnt/gnt.h	Sun Nov 25 14:16:54 2007 +0000
@@ -30,6 +30,9 @@
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
  */
 
+#ifndef GNT_H
+#define GNT_H
+
 #include <glib.h>
 #include "gntwidget.h"
 #include "gntclipboard.h"
@@ -201,3 +204,4 @@
  */
 gboolean gnt_is_refugee(void);
 
+#endif /* GNT_H */
diff -r 6b10805d29bc -r b12d8d11d46c libpurple/protocols/qq/packet_parse.h
--- a/libpurple/protocols/qq/packet_parse.h	Sun Nov 25 14:12:35 2007 +0000
+++ b/libpurple/protocols/qq/packet_parse.h	Sun Nov 25 14:16:54 2007 +0000
@@ -23,7 +23,7 @@
  */
 
 #ifndef _QQ_PACKET_PARSE_H_
-#define _QQ_PACKED_PARSE_H_
+#define _QQ_PACKET_PARSE_H_
 
 #include <glib.h>
 #include <time.h>