summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnders Carlsson <andersca@imendio.com>2005-11-22 10:01:03 +0000
committerAnders Carlsson <andersca@src.gnome.org>2005-11-22 10:01:03 +0000
commitfbebb232db61324e89406a27bc914ace62c68e79 (patch)
tree032f043f8f22b0306c19d2dd884222618d92b7d8
parenta3c408286e1700eac5c9c7c7762c1a3027f990a4 (diff)
downloadgdk-pixbuf-fbebb232db61324e89406a27bc914ace62c68e79.tar.gz
Add quartz backend.
2005-11-21 Anders Carlsson <andersca@imendio.com> * configure.in: * gtk/Makefile.am: * gdk/Makefile.am: * gdk/quartz/*: Add quartz backend. * docs/tools/Makefile.am: Only build docshooter when the X11 backend is used. * gtk/gtkplug-stub.c: Include gtkplug.h here. * gtk/gtksocket-stub.c: Include gtksocket.h here.
-rw-r--r--ChangeLog18
-rw-r--r--ChangeLog.pre-2-1018
2 files changed, 36 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 94011d9da..a71cfecf5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,20 @@
+2005-11-21 Anders Carlsson <andersca@imendio.com>
+
+ * configure.in:
+ * gtk/Makefile.am:
+ * gdk/Makefile.am:
+ * gdk/quartz/*:
+ Add quartz backend.
+
+ * docs/tools/Makefile.am:
+ Only build docshooter when the X11 backend is used.
+
+ * gtk/gtkplug-stub.c:
+ Include gtkplug.h here.
+
+ * gtk/gtksocket-stub.c:
+ Include gtksocket.h here.
+
2005-11-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksocket.c: Convert GtkSocket to g_type_class_add_private.
@@ -21,6 +38,7 @@
(gtk_combo_box_child_show, gtk_combo_box_child_hide): Use
g_signal_emit, not g_signal_emit_by_name.
+>>>>>>> 1.7265
2005-11-18 Matthias Clasen <mclasen@redhat.com>
Fix crashes in connection with pathbar scrolling (#321560,
diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 94011d9da..a71cfecf5 100644
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,20 @@
+2005-11-21 Anders Carlsson <andersca@imendio.com>
+
+ * configure.in:
+ * gtk/Makefile.am:
+ * gdk/Makefile.am:
+ * gdk/quartz/*:
+ Add quartz backend.
+
+ * docs/tools/Makefile.am:
+ Only build docshooter when the X11 backend is used.
+
+ * gtk/gtkplug-stub.c:
+ Include gtkplug.h here.
+
+ * gtk/gtksocket-stub.c:
+ Include gtksocket.h here.
+
2005-11-21 Matthias Clasen <mclasen@redhat.com>
* gtk/gtksocket.c: Convert GtkSocket to g_type_class_add_private.
@@ -21,6 +38,7 @@
(gtk_combo_box_child_show, gtk_combo_box_child_hide): Use
g_signal_emit, not g_signal_emit_by_name.
+>>>>>>> 1.7265
2005-11-18 Matthias Clasen <mclasen@redhat.com>
Fix crashes in connection with pathbar scrolling (#321560,