]> source.dussan.org Git - xmlgraphics-fop.git/commit
Merge from trunk
authorSimon Pepping <spepping@apache.org>
Sat, 18 Dec 2010 11:36:28 +0000 (11:36 +0000)
committerSimon Pepping <spepping@apache.org>
Sat, 18 Dec 2010 11:36:28 +0000 (11:36 +0000)
commite914537cba3c39675b04de25c292b1f51d46e3e0
treed401e72b84f51bb254f058387c2cc3d3ab6242ff
parentc4aab2f512ffa516e3ebfcf7566ebff4998afa2b
parentd4ec49dd8f220752be8a5ab0cf6d6f4e30a1e685
Merge from trunk

git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ComplexScripts@1050618 13f79535-47bb-0310-9956-ffa450edef68
src/java/org/apache/fop/area/LineArea.java
src/java/org/apache/fop/area/inline/InlineArea.java
src/java/org/apache/fop/area/inline/InlineParent.java