]> source.dussan.org Git - xmlgraphics-fop.git/commitdiff
Merged trunk:r1071913-1080138
authorSimon Pepping <spepping@apache.org>
Thu, 10 Mar 2011 08:04:40 +0000 (08:04 +0000)
committerSimon Pepping <spepping@apache.org>
Thu, 10 Mar 2011 08:04:40 +0000 (08:04 +0000)
git-svn-id: https://svn.apache.org/repos/asf/xmlgraphics/fop/branches/Temp_ComplexScripts@1080144 13f79535-47bb-0310-9956-ffa450edef68

1  2 
build.xml
src/java/org/apache/fop/layoutmgr/inline/InlineLayoutManager.java

diff --cc build.xml
Simple merge