Skip to content

Commit 045e791

Browse files
author
Wilhelm Wiens
committed
Merge branch 'master' into serialPlotterClearButton
2 parents ee0b524 + f4acfcb commit 045e791

File tree

1,006 files changed

+31321
-247424
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,006 files changed

+31321
-247424
lines changed

‎.classpath

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<classpathentry kind="src" path="app/test"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
66
<classpathentry kind="lib" path="app/lib/apple.jar"/>
7-
<classpathentry kind="lib" path="app/lib/ecj.jar"/>
87
<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
98
<classpathentry kind="lib" path="app/test-lib/fest-assert-1.2.jar"/>
109
<classpathentry kind="lib" path="app/test-lib/fest-reflect-1.2.jar"/>
@@ -19,14 +18,16 @@
1918
<classpathentry kind="lib" path="app/lib/jmdns-3.5.1.jar"/>
2019
<classpathentry kind="lib" path="app/lib/slf4j-api-1.7.22.jar"/>
2120
<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
22-
<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>
2321
<classpathentry kind="lib" path="app/lib/bcpg-jdk15on-152.jar"/>
2422
<classpathentry kind="lib" path="app/lib/bcprov-jdk15on-152.jar"/>
25-
<classpathentry kind="lib" path="app/lib/jackson-core-2.6.3.jar"/>
26-
<classpathentry kind="lib" path="app/lib/jackson-databind-2.6.3.jar"/>
27-
<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.6.3.jar"/>
28-
<classpathentry kind="lib" path="app/lib/jackson-annotations-2.6.3.jar"/>
23+
<classpathentry kind="lib" path="app/lib/jackson-core-2.9.5.jar"/>
24+
<classpathentry kind="lib" path="app/lib/jackson-databind-2.9.5.jar"/>
25+
<classpathentry kind="lib" path="app/lib/jackson-module-mrbean-2.9.5.jar"/>
26+
<classpathentry kind="lib" path="app/lib/jackson-annotations-2.9.5.jar"/>
2927
<classpathentry kind="lib" path="app/lib/commons-compress-1.8.jar"/>
3028
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
29+
<classpathentry kind="lib" path="app/lib/jssc-2.8.0-arduino1.jar"/>
30+
<classpathentry kind="lib" path="app/lib/java-semver-0.8.0.jar"/>
31+
<classpathentry combineaccessrules="false" kind="src" path="/app"/>
3132
<classpathentry kind="output" path="app/bin"/>
3233
</classpath>

‎app/.classpath

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@
44
<classpathentry kind="src" path="test"/>
55
<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
66
<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
7-
<classpathentry kind="output" path="bin"/>
87
<classpathentry kind="lib" path="lib/apple.jar"/>
98
<classpathentry kind="lib" path="lib/batik-1.8.jar"/>
109
<classpathentry kind="lib" path="lib/batik-anim-1.8.jar"/>
@@ -33,16 +32,16 @@
3332
<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
3433
<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
3534
<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
36-
<classpathentry kind="lib" path="lib/jackson-annotations-2.6.3.jar"/>
37-
<classpathentry kind="lib" path="lib/jackson-core-2.6.3.jar"/>
38-
<classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
39-
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
35+
<classpathentry kind="lib" path="lib/jackson-annotations-2.9.5.jar"/>
36+
<classpathentry kind="lib" path="lib/jackson-core-2.9.5.jar"/>
37+
<classpathentry kind="lib" path="lib/jackson-databind-2.9.5.jar"/>
38+
<classpathentry kind="lib" path="lib/jackson-module-mrbean-2.9.5.jar"/>
4039
<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
41-
<classpathentry kind="lib" path="lib/jmdns-3.5.1.jar"/>
40+
<classpathentry kind="lib" path="lib/jmdns-3.5.3.jar"/>
4241
<classpathentry kind="lib" path="lib/slf4j-api-1.7.22.jar"/>
4342
<classpathentry kind="lib" path="lib/slf4j-simple-1.7.22.jar"/>
4443
<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
45-
<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino1.jar"/>
44+
<classpathentry kind="lib" path="lib/jssc-2.8.0-arduino2.jar"/>
4645
<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.6.1.jar"/>
4746
<classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
4847
<classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
@@ -53,4 +52,6 @@
5352
<classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
5453
<classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
5554
<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
55+
<classpathentry kind="lib" path="lib/autocomplete-2.6.1.jar"/>
56+
<classpathentry kind="output" path="bin"/>
5657
</classpath>

‎app/build.xml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,6 +130,8 @@
130130
</target>
131131

132132
<target name="build" depends="compile" description="Build PDE">
133-
<jar basedir="bin" destfile="pde.jar" />
133+
<jar basedir="bin" destfile="pde.jar" >
134+
<fileset dir="src" includes="**/icons/**" />
135+
</jar>
134136
</target>
135137
</project>

‎app/lib/autocomplete-2.6.1.jar

148 KB
Binary file not shown.

‎app/lib/jackson-annotations-2.6.3.jar

-45.9 KB
Binary file not shown.

‎app/lib/jackson-annotations-2.9.5.jar

65.4 KB
Binary file not shown.

‎app/lib/jackson-core-2.6.3.jar

-253 KB
Binary file not shown.

‎app/lib/jackson-core-2.9.5.jar

314 KB
Binary file not shown.

‎app/lib/jackson-databind-2.6.3.jar

-1.12 MB
Binary file not shown.

‎app/lib/jackson-databind-2.9.5.jar

1.28 MB
Binary file not shown.

0 commit comments

Comments
 (0)