Merge pull request #1 from arduino/master

pull master

Author: me-no-dev

.classpath

@@ -3,7 +3,6 @@
 	<classpathentry excluding="processing/app/tools/format/|processing/app/tools/format/src/|processing/app/Trace.java|processing/app/RunnerClassLoader.java" kind="src" path="app/src"/>
 	<classpathentry kind="src" path="app/test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
-	<classpathentry kind="lib" path="app/lib/antlr.jar"/>
 	<classpathentry kind="lib" path="app/lib/apple.jar"/>
 	<classpathentry kind="lib" path="app/lib/ecj.jar"/>
 	<classpathentry kind="lib" path="app/test-lib/junit-4.11.jar"/>
@@ -16,6 +15,7 @@
 	<classpathentry kind="lib" path="app/lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="app/lib/commons-net-3.3.jar"/>
 	<classpathentry kind="lib" path="app/lib/jmdns-3.4.1.jar"/>
 	<classpathentry kind="lib" path="app/lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="app/lib/jssc-2.8.0.jar"/>

.gitignore

@@ -14,6 +14,7 @@ hardware/arduino/bootloaders/caterina_LUFA/Caterina.elf
 hardware/arduino/bootloaders/caterina_LUFA/Caterina.eep
 hardware/arduino/bootloaders/caterina_LUFA/.dep/
 build/*.zip
+build/*.tar.bz2
 build/windows/work/
 build/windows/*.zip
 build/windows/*.tgz
@@ -33,7 +34,7 @@ build/macosx/libastylej*
 build/macosx/appbundler*.jar
 build/macosx/appbundler*.zip
 build/macosx/appbundler
-build/macosx/appbundler-1.0ea-arduino3
+build/macosx/appbundler-1.0ea-arduino?
 build/macosx/appbundler-1.0ea-arduino*.zip
 build/macosx/appbundler-1.0ea-upstream*.zip
 build/linux/work/

README.md

@@ -10,7 +10,8 @@ IDE can be downloaded for free at http://www.arduino.cc/en/Main/Software
 
 * For more information, see the website at: http://www.arduino.cc/
 or the forums at: http://www.arduino.cc/forum/  
-You can also follow Arduino on twitter at: https://twitter.com/arduino or like Arduino on Facebook at: https://www.facebook.com/official.arduino
+You can also follow Arduino on twitter at: https://twitter.com/arduino or
+like Arduino on Facebook at: https://www.facebook.com/official.arduino
 
 * To report a *bug* in the software or to request *a simple enhancement* go to:
 http://github.com/arduino/Arduino/issues
@@ -35,11 +36,18 @@ Credits
 --------
 Arduino is an open source project, supported by many.
 
-The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe,
-Gianluca Martino, Daniela Antonietti, and David A. Mellis.
-
-Arduino uses the [GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc), [avrdude](http://www.nongnu.org/avrdude/), [avr-libc](http://www.nongnu.org/avr-libc/), and code from
-[Processing](http://www.processing.org) and [Wiring](http://wiring.org.co).
+The Arduino team is composed of Massimo Banzi, David Cuartielles, Tom Igoe
+and David A. Mellis.
+
+Arduino uses
+[GNU avr-gcc toolchain](http://gcc.gnu.org/wiki/avr-gcc),
+[GCC ARM Embedded toolchain](https://launchpad.net/gcc-arm-embedded),
+[avr-libc](http://www.nongnu.org/avr-libc/),
+[avrdude](http://www.nongnu.org/avrdude/),
+[bossac](http://www.shumatech.com/web/products/bossa),
+[openOCD](http://openocd.org/)
+and code from [Processing](http://www.processing.org)
+and [Wiring](http://wiring.org.co).
 
 Icon and about image designed by [ToDo](http://www.todo.to.it/)
 

app/.classpath

@@ -3,8 +3,6 @@
 	<classpathentry excluding="processing/app/tools/format/" kind="src" path="src"/>
 	<classpathentry kind="src" path="test"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.8"/>
-	<classpathentry kind="lib" path="lib/antlr.jar"/>
-	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="lib" path="lib/apple.jar"/>
 	<classpathentry kind="lib" path="lib/bcpg-jdk15on-152.jar"/>
 	<classpathentry kind="lib" path="lib/bcprov-jdk15on-152.jar"/>
@@ -13,6 +11,7 @@
 	<classpathentry kind="lib" path="lib/commons-exec-1.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-httpclient-3.1.jar"/>
 	<classpathentry kind="lib" path="lib/commons-logging-1.0.4.jar"/>
+	<classpathentry kind="lib" path="lib/commons-net-3.3.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-annotations-2.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-core-2.2.3.jar"/>
 	<classpathentry kind="lib" path="lib/jackson-databind-2.2.3.jar"/>
@@ -28,8 +27,7 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/arduino-core"/>
 	<classpathentry kind="lib" path="test-lib/jcip-annotations-1.0.jar"/>
 	<classpathentry kind="lib" path="lib/commons-lang3-3.3.2.jar"/>
-	<classpathentry kind="lib" path="lib/guava-18.0.jar"/>
 	<classpathentry kind="lib" path="lib/java-semver-0.8.0.jar"/>
-	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.7.1+arduino.jar"/>
+	<classpathentry kind="lib" path="lib/rsyntaxtextarea-2.5.8.1+arduino.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/.classpath_macosx

@@ -13,7 +13,6 @@
 	<classpathentry combineaccessrules="false" kind="src" path="/pdf"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/serial"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/video"/>
-	<classpathentry kind="lib" path="lib/antlr.jar"/>
 	<classpathentry kind="lib" path="lib/ecj.jar"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>

app/build.xml

@@ -102,6 +102,7 @@
       <fileset dir="test" includes="**/*.json*" />
       <fileset dir="test" includes="**/*.key" />
       <fileset dir="test" includes="**/*.hex" />
+      <fileset dir="test" includes="**/*.pac" />
     </copy>
 
     <junit printsummary="yes" dir="${work.dir}" fork="true">
@@ -111,7 +112,6 @@
       <classpath>
         <pathelement location="bin"/>
         <pathelement location="test-bin"/>
-        <pathelement path="../build/macosx/work/Arduino.app/Contents/Resources/Java/quaqua.jar"/>
         <path refid="class.path.test"/>
       </classpath>