Skip to content

Commit

Permalink
Merge remote-tracking branch 'Tainfante_origin/master' into jakieś_te…
Browse files Browse the repository at this point in the history
…sting-mode
  • Loading branch information
opetany93 committed Dec 23, 2017
2 parents 25499c8 + f65ff20 commit c11545f
Show file tree
Hide file tree
Showing 6 changed files with 785 additions and 101 deletions.
1 change: 1 addition & 0 deletions RealTimeSerialPlotter.iml
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,6 @@
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="com.github.purejavacomm:purejavacomm:1.0.2.RELEASE" level="project" />
<orderEntry type="library" name="net.java.openjfx.backport:openjfx-78-backport:1.8.0-ea-b96.1" level="project" />
</component>
</module>
Loading

0 comments on commit c11545f

Please sign in to comment.