Merge remote-tracking branch 'arduino/master' into iserial2_complete

app/src/processing/app/Base.java

@@ -222,15 +222,15 @@ static public void guardedMain(String args[]) throws Exception {
     INSTANCE = new Base(args);
   }
 
-  
+
   static public void initLogger() {
     Handler consoleHandler = new ConsoleLogger();
     consoleHandler.setLevel(Level.ALL);
     consoleHandler.setFormatter(new LogFormatter("%1$tl:%1$tM:%1$tS [%4$7s] %2$s: %5$s%n"));
-    
+
     Logger globalLogger = Logger.getLogger(Logger.GLOBAL_LOGGER_NAME);
     globalLogger.setLevel(consoleHandler.getLevel());
-    
+
     // Remove default
     Handler[] handlers = globalLogger.getHandlers();
     for(Handler handler : handlers) {
@@ -241,13 +241,13 @@ static public void initLogger() {
     for(Handler handler : handlers) {
       root.removeHandler(handler);
     }
-    
+
     globalLogger.addHandler(consoleHandler);
-    
+
     Logger.getLogger("cc.arduino.packages.autocomplete").setParent(globalLogger);
     Logger.getLogger("br.com.criativasoft.cpluslibparser").setParent(globalLogger);
     Logger.getLogger(Base.class.getPackage().getName()).setParent(globalLogger);
-    
+
   }
 
 
@@ -1754,7 +1754,7 @@ public void paint(Graphics graphics) {
 
         Font f = new Font("SansSerif", Font.PLAIN, Theme.scale(11));
         g.setFont(f);
-        g.setColor(Color.white);
+        g.setColor(new Color(0,151,156));
         g.drawString(BaseNoGui.VERSION_NAME_LONG, Theme.scale(33), Theme.scale(20));
       }
     };
@@ -1952,7 +1952,7 @@ static public void showReference(String prefix, String filename) {
     File referenceFile = new File(referenceFolder, filename);
     if (!referenceFile.exists())
       referenceFile = new File(referenceFolder, filename + ".html");
-    
+
     if(referenceFile.exists()){
       openURL(referenceFile.getAbsolutePath());
     }else{

build/arduino-builder-linux32-1.3.15.tar.bz2.sha

@@ -0,0 +1 @@
+d192fdadce5298f02b8fd5d310f0d8c3c359e41f

build/arduino-builder-linux64-1.3.15.tar.bz2.sha

@@ -0,0 +1 @@
+5c78ef903c9d45e89f84a77673bb6582712e982b

build/arduino-builder-macosx-1.3.15.tar.bz2.sha

@@ -0,0 +1 @@
+708692dfc3af793170cdc964367abc628fcf0811

build/arduino-builder-windows-1.3.15.zip.sha

@@ -0,0 +1 @@
+c504cf4bd956325e7c86982ff06990a976ae5867

build/build.xml

@@ -77,7 +77,7 @@
 
   <property name="portable" value="false" />
 
-  <property name="ARDUINO-BUILDER-VERSION" value="1.3.14" />
+  <property name="ARDUINO-BUILDER-VERSION" value="1.3.15" />
 
   <!-- Libraries required for running arduino -->
   <fileset dir=".." id="runtime.jars">

build/shared/revisions.txt

@@ -2,6 +2,7 @@ ARDUINO 1.6.9
 
 [ide]
 * Catch and report errors during parsing contributed index files
+* Fixed IDE version color on about dialog box. Thanks @ivanebernal
 
 [core]
 * sam: Allow 3rd party boards that depend on SAM core to use their own