8000 Merge pull request #1 from arduino/master · arduino/Arduino@28afa8c · GitHub
[go: up one dir, main page]
Skip to content

Commit 28afa8c

Browse files
feilipufeilipu
committed
Merge pull request #1 from arduino/master
Catch up with Master
2 parents fae8c42 + 0496b0d commit 28afa8c

File tree

107 files changed

+2511
-650
lines changed
  • tab-sel-left@2x.png
  • tab-sel-menu.gif
  • tab-sel-menu.png
  • tab-sel-menu.svg
  • tab-sel-menu@2x.png
  • tab-sel-mid.gif
  • tab-sel-mid.png
  • tab-sel-mid.svg
  • tab-sel-mid@2x.png
  • tab-sel-right.gif
  • tab-sel-right.png
  • tab-sel-right.svg
  • tab-sel-right@2x.png
  • tab-unsel-left.gif
  • tab-unsel-left.png
  • tab-unsel-left.svg
  • tab-unsel-left@2x.png
  • tab-unsel-menu.gif
  • tab-unsel-menu.png
  • tab-unsel-menu.svg
  • tab-unsel-menu@2x.png
  • tab-unsel-mid.gif
  • tab-unsel-mid.png
  • tab-unsel-mid.svg
  • tab-unsel-mid@2x.png
  • tab-unsel-right.gif
  • tab-unsel-right.png
  • tab-unsel-right.svg
  • tab-unsel-right@2x.png
  • theme.txt
  • revisions.txt
  • windows/launcher

    • Some content is hidden

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

    107 files changed

    +2511
    -650
    lines changed

    ‎app/.classpath

    Lines changed: 26 additions & 5 deletions
    Original file line numberDiff line numberDiff line change
    @@ -3,31 +3,52 @@
    33
    <classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
    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"/>
    6+
    <classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
    7+
    <classpathentry kind="output" path="bin"/>
    68
    <classpathentry kind="lib" path="lib/apple.jar"/>
    9+
    <classpathentry kind="lib" path="lib/batik-1.8.jar"/>
    10+
    <classpathentry kind="lib" path="lib/batik-anim-1.8.jar"/>
    11+
    <classpathentry kind="lib" path="lib/batik-awt-util-1.8.jar"/>
    12+
    <classpathentry kind="lib" path="lib/batik-bridge-1.8.jar"/>
    13+
    <classpathentry kind="lib" path="lib/batik-codec-1.8.jar"/>
    14+
    <classpathentry kind="lib" path="lib/batik-css-1.8.jar"/>
    15+
    <classpathentry kind="lib" path="lib/batik-dom-1.8.jar"/>
    16+
    <classpathentry kind="lib" path="lib/batik-ext-1.8.jar"/>
    17+
    <classpathentry kind="lib" path="lib/batik-gvt-1.8.jar"/>
    18+
    <classpathentry kind="lib" path="lib/batik-parser-1.8.jar"/>
    19+
    <classpathentry kind="lib" path="lib/batik-rasterizer-1.8.jar"/>
    20+
    <classpathentry kind="lib" path="lib/batik-script-1.8.jar"/>
    21+
    <classpathentry kind="lib" path="lib/batik-squiggle-1.8.jar"/>
    22+
    <classpathentry kind="lib" path="lib/batik-svg-dom-1.8.jar"/>
    23+
    <classpathentry kind="lib" path="lib/batik-svgpp-1.8.jar"/>
    24+
    <classpathentry kind="lib" path="lib/batik-transcoder-1.8.jar"/>
    25+
    <classpathentry kind="lib" path="lib/batik-util-1.8.jar"/>
    26+
    <classpathentry kind="lib" path="lib/batik-xml-1.8.jar"/>
    727
    <classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
    828
    <classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
    929
    <classpathentry kind="lib" path="lib/commons-codec-1.7.jar"/>
    1030
    <classpathentry kind="lib" path="lib/commons-compress-1.8.jar"/>
    1131
    <classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
    1232
    <classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
    33+
    <classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
    1334
    <classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
    1435
    <classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
    1536
    <classpathentry kind="lib" path="lib/jackson-annotations-2.6.3.jar"/>
    1637
    <classpathentry kind="lib" path="lib/jackson-core-2.6.3.jar"/>
    1738
    <classpathentry kind="lib" path="lib/jackson-databind-2.6.3.jar"/>
    1839
    <classpathentry kind="lib" path="lib/jackson-module-mrbean-2.6.3.jar"/>
    40+
    <classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
    1941
    <classpathentry kind="lib" path="lib/jmdns-3.4.1.jar"/>
    2042
    <classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
    2143
    <classpathentry kind="lib" path="lib/jssc-2.8.0.jar"/>
    44+
    <classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
    45+
    <classpathentry kind="lib" path="lib/xml-apis-1.3.04.jar"/>
    46+
    <classpathentry kind="lib" path="lib/xml-apis-ext-1.3.04.jar"/>
    47+
    <classpathentry kind="lib" path="lib/xmlgraphics-commons-2.0.jar"/>
    2248
    <classpathentry kind="lib" path="test-lib/junit-4.11.jar"/>
    2349
    <classpathentry kind="lib" path="test-lib/fest-assert-1.2.jar"/>
    2450
    <classpathentry kind="lib" path="test-lib/fest-reflect-1.2.jar"/>
    2551
    <classpathentry kind="lib" path="test-lib/fest-swing-1.2.jar"/>
    2652
    <classpathentry kind="lib" path="test-lib/fest-util-1.1.2.jar"/>
    27-
    <classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
    2853
    <classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
    29-
    <classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
    30-
    <classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
    31-
    <classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
    32-
    <classpathentry kind="output" path="bin"/>
    3354
    </classpath>

    ‎app/lib/README.xml-apis-1.3.04.txt

    Lines changed: 30 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,30 @@
    1+
    This distribution includes xml-apis.jar from the XML Commons External
    2+
    1.3.04 binary distribution, which can also be obtained from:
    3+
    4+
    http://xml.apache.org/mirrors.cgi
    5+
    6+
    Source code is available from the XML Commons web site:
    7+
    8+
    http://xml.apache.org/commons/
    9+
    10+
    xml-apis.jar contains:
    11+
    12+
    - DOM Level 2 Events
    13+
    - DOM Level 2 HTML
    14+
    - DOM Level 2 Style
    15+
    - DOM Level 2 Traversal and Range
    16+
    - DOM Level 2 Views
    17+
    - DOM Level 3 Core
    18+
    - DOM Level 3 Load and Save
    19+
    - DOM Level 3 XPath
    20+
    - JAXP 1.3 (JSR 206)
    21+
    - SAX
    22+
    23+
    All DOM code is licensed under the W3C Software License, and DOM documentation
    24+
    under the W3C Document License. See LICENSE.dom-software.txt and
    25+
    LICENSE.dom-documentation.txt.
    26+
    27+
    The JAXP 1.3 code is licensed under the Apache Software License 2.0, which is
    28+
    in the LICENSE in the root directory of this distribution.
    29+
    30+
    SAX is public domain. See LICENSE.sax.txt.

    ‎app/lib/README.xml-apis-ext-1.3.04.txt

    Lines changed: 19 additions & 0 deletions
    Original file line numberDiff line numberDiff line change
    @@ -0,0 +1,19 @@
    1+
    This distribution includes xml-apis-ext.jar from the XML Commons External
    2+
    1.3.04 binary distribution, which can also be obtained from:
    3+
    4+
    http://xml.apache.org/mirrors.cgi
    5+
    6+
    Source code is available from the XML Commons web site:
    7+
    8+
    http://xml.apache.org/commons/
    9+
    10+
    xml-apis-ext.jar contains:
    11+
    12+
    - SAC 1.3
    13+
    - SMIL Java bindings
    14+
    - SVG 1.1 Java bindings
    15+
    16+
    SAC 1.3, the SMIL Java bindings and the SVG 1.1 Java bindings are licensed
    17+
    under the W3C Software License. Related documentation is licensed under the
    18+
    W3C Document License. See LICENSE.dom-software.txt and
    19+
    LICENSE.dom-documentation.txt.

    ‎app/lib/batik-1.8.jar

    5.12 KB
    Binary file not shown.

    ‎app/lib/batik-anim-1.8.jar

    368 KB
    Binary file not shown.

    ‎app/lib/batik-awt-util-1.8.jar

    294 KB
    Binary file not shown.

    ‎app/lib/batik-bridge-1.8.jar

    517 KB
    Binary file not shown.

    ‎app/lib/batik-codec-1.8.jar

    106 KB
    Binary file not shown.

    ‎app/lib/batik-css-1.8.jar

    251 KB
    Binary file not shown.

    ‎app/lib/batik-dom-1.8.jar

    137 KB
    Binary file not shown.

    0 commit comments

    Comments
     (0)
    0