projects
/
platform
/
upstream
/
pango.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
44fbe23
)
adding allow-none introspection metadata to pango_font_description_merge parameters
author
Alberto Ruiz
<aruiz@gnome.org>
Mon, 25 Apr 2011 12:22:27 +0000
(13:22 +0100)
committer
Alberto Ruiz
<aruiz@gnome.org>
Mon, 25 Apr 2011 12:22:27 +0000
(13:22 +0100)
pango/fonts.c
patch
|
blob
|
history
diff --git
a/pango/fonts.c
b/pango/fonts.c
index
800d383
..
4c33499
100644
(file)
--- a/
pango/fonts.c
+++ b/
pango/fonts.c
@@
-509,7
+509,7
@@
pango_font_description_unset_fields (PangoFontDescription *desc,
/**
* pango_font_description_merge:
* @desc: a #PangoFontDescription
- * @desc_to_merge: the #PangoFontDescription to merge from, or %NULL
+ * @desc_to_merge:
(allow-none):
the #PangoFontDescription to merge from, or %NULL
* @replace_existing: if %TRUE, replace fields in @desc with the
* corresponding values from @desc_to_merge, even if they
* are already exist.