Skip to content

Commit

Permalink
Merge branch 'master' of [email protected]:makerbot/ReplicatorG---Future…
Browse files Browse the repository at this point in the history
….git
  • Loading branch information
nmsl1993 committed Sep 8, 2011
2 parents 4fcf400 + ab97f52 commit 4e7ce25
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 16 deletions.
16 changes: 1 addition & 15 deletions .classpath
Original file line number Diff line number Diff line change
@@ -1,20 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
<classpathentry kind="src" output="classes" path="src"/>
<classpathentry kind="var" path="JRE_LIB" sourcepath="JRE_SRC"/>
<classpathentry kind="lib" path="build/shared/lib/filedrop.jar"/>
<classpathentry kind="lib" path="build/shared/lib/j3dcore.jar"/>
<classpathentry kind="lib" path="build/shared/lib/j3dutils.jar"/>
<classpathentry kind="lib" path="build/shared/lib/jcommon-1.0.16.jar"/>
<classpathentry kind="lib" path="build/shared/lib/jfreechart-1.0.13.jar"/>
<classpathentry kind="lib" path="build/shared/lib/keywords.txt"/>
<classpathentry kind="lib" path="build/shared/lib/loading.gif"/>
<classpathentry kind="lib" path="build/shared/lib/logo.gif"/>
<classpathentry kind="lib" path="build/shared/lib/miglayout-3.7.4.jar"/>
<classpathentry kind="lib" path="build/shared/lib/mrj.jar"/>
<classpathentry kind="lib" path="build/shared/lib/quaqua.jar"/>
<classpathentry kind="lib" path="build/shared/lib/RXTXcomm.jar"/>
<classpathentry kind="lib" path="build/shared/lib/twitter4j-2.0.10.jar"/>
<classpathentry kind="lib" path="build/shared/lib/vecmath.jar"/>
<classpathentry kind="var" path="JRE_LIB" rootpath="JRE_SRCROOT" sourcepath="JRE_SRC"/>
<classpathentry kind="output" path="classes"/>
</classpath>
3 changes: 2 additions & 1 deletion build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -88,7 +88,7 @@

<target name="run" depends="jar">
<java fork="true" classname="replicatorg.app.Base"> <!-- jvm="/usr/lib/jvm/java-1.5.0-sun/bin/java" -->
<jvmarg value="-ea"/>
<jvmarg value="-Xmx512m"/>
<jvmarg value="-XX:+HeapDumpOnOutOfMemoryError"/>
<jvmarg value="${native.java.flags}"/>
<classpath>
Expand Down Expand Up @@ -218,6 +218,7 @@
</copy>
<copy todir="${target.dir}/examples">
<fileset dir="examples"/>
</copy>
<copy todir="${target.dir}/DualStrusion_Snippets">
<fileset dir="DualStrusion_Snippets"/>
</copy>
Expand Down

0 comments on commit 4e7ce25

Please sign in to comment.