# HG changeset patch
# User sugi
# Date 1404718885 -32400
# Node ID 79a0c18dd2c38323960055e26902cbe66277d8bf
# Parent  b42eee3348b26d1f4d06a40e47be66a277d68714# Parent  5b05279291a161ad8bfa16b0bcb674ee0a83c96a
Merge with 5b05279291a161ad8bfa16b0bcb674ee0a83c96a

diff -r b42eee3348b2 -r 79a0c18dd2c3 .classpath
--- a/.classpath	Mon Jul 07 16:23:58 2014 +0900
+++ b/.classpath	Mon Jul 07 16:41:25 2014 +0900
@@ -1,22 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
+	<classpathentry kind="output" path="bin"/>
 	<classpathentry kind="src" path="src/main/java"/>
 	<classpathentry kind="src" path="src/main/resources"/>
 	<classpathentry kind="src" path="src/test/java"/>
-	<classpathentry kind="lib" path="lib/com.alexmerz.graphviz.jar"/>
-	<classpathentry kind="lib" path="lib/j3d-core-1.3.1.jar"/>
-	<classpathentry kind="lib" path="lib/j3dutils.jar"/>
-	<classpathentry kind="lib" path="lib/javassist.jar"/>
-	<classpathentry kind="lib" path="lib/jimColModelImporterJFX.jar"/>
-	<classpathentry kind="lib" path="lib/jimObjModelImporterJFX.jar"/>
-	<classpathentry kind="lib" path="lib/log4j-1.2.16.jar"/>
-	<classpathentry kind="lib" path="lib/msgpack-0.6.12-SNAPSHOT-sources.jar"/>
-	<classpathentry kind="lib" path="lib/msgpack-0.6.12-SNAPSHOT.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.6.1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-api-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1-sources.jar"/>
-	<classpathentry kind="lib" path="lib/slf4j-log4j12-1.6.1.jar"/>
-	<classpathentry kind="lib" path="lib/vecmath-1.5.2.jar"/>
-	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="output" path="bin"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/com.alexmerz.graphviz.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/javassist.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/jimColModelImporterJFX.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/jimObjModelImporterJFX.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/log4j-1.2.16.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/msgpack-0.6.12-SNAPSHOT-sources.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/msgpack-0.6.12-SNAPSHOT.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/slf4j-api-1.6.1-sources.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/slf4j-api-1.6.1.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/slf4j-log4j12-1.6.1-sources.jar" exported="true"/>
+	<classpathentry kind="lib" path="/Users/YU/workspace/Alice/lib/slf4j-log4j12-1.6.1.jar" exported="true"/>
 </classpath>
diff -r b42eee3348b2 -r 79a0c18dd2c3 .project
--- a/.project	Mon Jul 07 16:23:58 2014 +0900
+++ b/.project	Mon Jul 07 16:41:25 2014 +0900
@@ -17,7 +17,7 @@
 	</natures>
 	<filteredResources>
 		<filter>
-			<id>1404553678816</id>
+			<id>1404284239507</id>
 			<name></name>
 			<type>30</type>
 			<matcher>
diff -r b42eee3348b2 -r 79a0c18dd2c3 .settings/org.eclipse.jdt.core.prefs
--- a/.settings/org.eclipse.jdt.core.prefs	Mon Jul 07 16:23:58 2014 +0900
+++ b/.settings/org.eclipse.jdt.core.prefs	Mon Jul 07 16:41:25 2014 +0900
@@ -1,5 +1,5 @@
 #
-#Mon Jun 30 22:09:56 JST 2014
+#Mon Jul 07 16:33:01 JST 2014
 org.eclipse.jdt.core.compiler.debug.localVariable=generate
 org.eclipse.jdt.core.compiler.compliance=1.8
 org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
diff -r b42eee3348b2 -r 79a0c18dd2c3 lib/j3d-core-1.3.1.jar
Binary file lib/j3d-core-1.3.1.jar has changed
diff -r b42eee3348b2 -r 79a0c18dd2c3 lib/j3dutils.jar
Binary file lib/j3dutils.jar has changed
diff -r b42eee3348b2 -r 79a0c18dd2c3 lib/vecmath-1.5.2.jar
Binary file lib/vecmath-1.5.2.jar has changed