aboutsummaryrefslogtreecommitdiffstats
path: root/src/resources
diff options
context:
space:
mode:
authorAndreas Beeker <kiwiwings@apache.org>2015-07-24 21:47:55 +0000
committerAndreas Beeker <kiwiwings@apache.org>2015-07-24 21:47:55 +0000
commit7481844c98f174b1a0cedc56385872b8f4e343a2 (patch)
treead78c6cc7e6bd8fa1aadf4e2effb366160678e6e /src/resources
parentb5fcac48e1606a9d3893cbd31adcf94459192c31 (diff)
parent4e1c37905af496fcf0719b3ed623295c410040a9 (diff)
downloadpoi-7481844c98f174b1a0cedc56385872b8f4e343a2.tar.gz
poi-7481844c98f174b1a0cedc56385872b8f4e343a2.zip
merged common_sl branch to trunk
git-svn-id: https://svn.apache.org/repos/asf/poi/trunk@1692593 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'src/resources')
-rw-r--r--src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml (renamed from src/resources/ooxml/org/apache/poi/xslf/usermodel/presetShapeDefinitions.xml)0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/resources/ooxml/org/apache/poi/xslf/usermodel/presetShapeDefinitions.xml b/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml
index 4a3a0701d3..4a3a0701d3 100644
--- a/src/resources/ooxml/org/apache/poi/xslf/usermodel/presetShapeDefinitions.xml
+++ b/src/resources/main/org/apache/poi/sl/draw/geom/presetShapeDefinitions.xml