diff options
| author | Glenn Adams <gadams@apache.org> | 2012-04-13 06:06:54 +0000 |
|---|---|---|
| committer | Glenn Adams <gadams@apache.org> | 2012-04-13 06:06:54 +0000 |
| commit | 586396e38c1c22d12d44e76cfdb36606f67a914f (patch) | |
| tree | ca93cf8050b45b1cb8701c906ddbec6125e8f616 | |
| parent | 7ce408d248e6de52abc7cf65a6447020ef1b243d (diff) | |
| download | xmlgraphics-fop-586396e38c1c22d12d44e76cfdb36606f67a914f.tar.gz xmlgraphics-fop-586396e38c1c22d12d44e76cfdb36606f67a914f.zip | |
Fix merge collision that elided an action entry.
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/trunk@1325622 13f79535-47bb-0310-9956-ffa450edef68
| -rw-r--r-- | status.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/status.xml b/status.xml index df13b8fe6..c2885ef23 100644 --- a/status.xml +++ b/status.xml @@ -65,8 +65,8 @@ <action context="Code" dev="GA" type="fix" fixes-bug="52114"> Take leading derived space before/after into account when computing rows for TXT renderer. </action> - <action context="Code" dev="GA" type="fix" fixes-bug="52763"> - Support list-block in marker, thus preventing NPE. + <action context="Code" dev="PH" type="add" fixes-bug="49893"> + A global setting to wrap F11 images in page segments. </action> <action context="Code" dev="GA" type="fix" fixes-bug="52763"> Support list-block in marker, thus preventing NPE. @@ -362,9 +362,9 @@ Bugfix: fix performance issue when adding nodes, if the number of children is significantly large. </action> - <action context="Config" dev="SP" type="fix"> - Bugfix: relative URIs in the configuration file (base, font-base, hyphenation-base) are evaluated relative to the base URI of the configuration file. - </action> + <action context="Config" dev="SP" type="fix"> + Bugfix: relative URIs in the configuration file (base, font-base, hyphenation-base) are evaluated relative to the base URI of the configuration file. + </action> <action context="Layout" dev="AD" type="fix" fixes-bug="49848"> Bugfix: correct behavior of keep-together.within-line in case there are nested inlines </action> |