Merge branch 'topic37241branch' into develop

tmdmaker · Jun 14, 2017 · 71bb089 · 71bb089
2 parents a40f720 + cae0f77
commit 71bb089
Show file tree

Hide file tree

Showing 4 changed files with 2 additions and 2 deletions.
diff --git 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>
diff --git 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
diff --git a/tmdmaker.serializer/lib/xstream-1.4.10.jar b/tmdmaker.serializer/lib/xstream-1.4.10.jar
diff --git a/tmdmaker.serializer/lib/xstream-1.4.7.jar b/tmdmaker.serializer/lib/xstream-1.4.7.jar