提交: 71bb089f55f67a277f1a9ead7e65b86c34e1f1fc - tmdmaker (git)

TMD-Maker(T字形ER図作成ツール)のEclipse Plugin,RCP,Webサイト用

Commit MetaInfo

• 修订版: 71bb089f55f67a277f1a9ead7e65b86c34e1f1fc (tree)
• 时间: 2017-06-14 21:36:46
• 作者: nakag <nakag@user...>
• Commiter: nakag

Log Message

Merge branch 'topic37241branch' into develop

更改概述

• modified: tmdmaker.serializer/.classpath
• modified: tmdmaker.serializer/META-INF/MANIFEST.MF
• add: tmdmaker.serializer/lib/xstream-1.4.10.jar
• delete: tmdmaker.serializer/lib/xstream-1.4.7.jar

差异

--- a/tmdmaker.serializer/.classpath
+++ b/tmdmaker.serializer/.classpath
@@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.10.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
 	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
 	<classpathentry exported="true" kind="lib" path="lib/xpp3_min-1.1.4c.jar"/>
 	<classpathentry exported="true" kind="lib" path="lib/xmlpull-1.1.3.1.jar"/>
-	<classpathentry exported="true" kind="lib" path="lib/xstream-1.4.7.jar"/>
 	<classpathentry kind="src" path="src/"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>

--- a/tmdmaker.serializer/META-INF/MANIFEST.MF
+++ b/tmdmaker.serializer/META-INF/MANIFEST.MF
@@ -11,7 +11,7 @@ Bundle-ActivationPolicy: lazy
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Bundle-ClassPath: lib/xpp3_min-1.1.4c.jar,
  lib/xmlpull-1.1.3.1.jar,
- lib/xstream-1.4.7.jar,
+ lib/xstream-1.4.10.jar,
  .
 Export-Package: jp.sourceforge.tmdmaker.persistence.handler
 Bundle-Vendor: TMD-Maker Project

Binary files /dev/null and b/tmdmaker.serializer/lib/xstream-1.4.10.jar differ

Binary files a/tmdmaker.serializer/lib/xstream-1.4.7.jar and /dev/null differ