summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSven Herzberg <herzi@imendio.com>2007-11-13 21:05:09 +0000
committerSven Herzberg <herzi@src.gnome.org>2007-11-13 21:05:09 +0000
commit50f412114be215e0199c93af2ed9c9e7ba6d0b43 (patch)
tree78eca4c421aeda0087c4073e284ad23057f26fb9
parent118e9f41e23829d391e4be7de7c648ca9a491fc0 (diff)
downloadgtk+-50f412114be215e0199c93af2ed9c9e7ba6d0b43.tar.gz
Reviewed by Richard:
2007-11-12 Sven Herzberg <herzi@imendio.com> Reviewed by Richard: * gdk/quartz/gdkquartz.h: include <gdk/gdkprivate.h> with angle brackets and not with quotation marks svn path=/trunk/; revision=18987
-rw-r--r--ChangeLog8
-rw-r--r--gdk/quartz/gdkquartz.h2
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 29d6050b8a..f0287af607 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2007-11-12 Sven Herzberg <herzi@imendio.com>
+
+ Reviewed by Richard:
+
+ * gdk/quartz/gdkquartz.h: include <gdk/gdkprivate.h> with angle
+ brackets and not with quotation marks
+
2007-11-12 Alexander Larsson <alexl@redhat.com>
* gdk/x11/gdkselection-x11.c:
@@ -21,6 +28,7 @@
* gtk/gtkbuilder.c: Convert delayed_properties hashtable to linked
list. Fixes #495769.
+>>>>>>> .r18986
2007-11-10 Matthias Clasen <mclasen@redhat.com>
* tests/buildertest.c: Parse a file given on the cmdline.
diff --git a/gdk/quartz/gdkquartz.h b/gdk/quartz/gdkquartz.h
index 2950e733a6..84a04c9724 100644
--- a/gdk/quartz/gdkquartz.h
+++ b/gdk/quartz/gdkquartz.h
@@ -22,7 +22,7 @@
#define __GDK_QUARTZ_H__
#include <AppKit/AppKit.h>
-#include "gdk/gdkprivate.h"
+#include <gdk/gdkprivate.h>
G_BEGIN_DECLS