summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTor Lillqvist <tml@novell.com>2005-03-23 19:50:36 +0000
committerTor Lillqvist <tml@src.gnome.org>2005-03-23 19:50:36 +0000
commit833d2c30169c51d7711072bd738145b4faf92d5f (patch)
treebffa6ac42e0373f85b585614d375413326e729e8
parent4f660a6995a7c64b3972013dd3d6a89982db6f1a (diff)
downloadpango-833d2c30169c51d7711072bd738145b4faf92d5f.tar.gz
Merge from HEAD:
2005-03-23 Tor Lillqvist <tml@novell.com> Merge from HEAD: * pango/pango.def: Add missing pango_render_part_get_type. (#165287)
-rw-r--r--ChangeLog6
-rw-r--r--ChangeLog.pre-1-106
-rw-r--r--pango/pango.def1
3 files changed, 13 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 6e576714..45874766 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2005-03-23 Tor Lillqvist <tml@novell.com>
+
+ Merge from HEAD:
+
+ * pango/pango.def: Add missing pango_render_part_get_type. (#165287)
+
2005-03-20 Tor Lillqvist <tml@novell.com>
* modules/basic/basic-win32.c (make_langid): Leave out some
diff --git a/ChangeLog.pre-1-10 b/ChangeLog.pre-1-10
index 6e576714..45874766 100644
--- a/ChangeLog.pre-1-10
+++ b/ChangeLog.pre-1-10
@@ -1,3 +1,9 @@
+2005-03-23 Tor Lillqvist <tml@novell.com>
+
+ Merge from HEAD:
+
+ * pango/pango.def: Add missing pango_render_part_get_type. (#165287)
+
2005-03-20 Tor Lillqvist <tml@novell.com>
* modules/basic/basic-win32.c (make_langid): Leave out some
diff --git a/pango/pango.def b/pango/pango.def
index 6c2902ee..ccb3e6c8 100644
--- a/pango/pango.def
+++ b/pango/pango.def
@@ -273,6 +273,7 @@ EXPORTS
pango_parse_variant
pango_parse_weight
pango_read_line
+ pango_render_part_get_type
pango_renderer_activate
pango_renderer_deactivate
pango_renderer_draw_error_underline