Merge branch 'master' into stk500-jtagice3

Author: facchinm

.gitignore

@@ -20,6 +20,7 @@ build/windows/*.zip
 build/windows/*.tgz
 build/windows/*.tar.bz2
 build/windows/libastylej*
+build/windows/liblistSerials*
 build/windows/arduino-*.zip
 build/windows/dist/*.tar.gz
 build/windows/dist/*.tar.bz2

app/src/cc/arduino/contributions/libraries/ui/ContributedLibraryTableCellJPanel.java

@@ -221,6 +221,7 @@ private JTextPane makeNewDescription() {
       StyleSheet s = html.getStyleSheet();
       s.addRule("body { margin: 0; padding: 0;"
                 + "font-family: Verdana, Geneva, Arial, Helvetica, sans-serif;"
+                + "color: black;"
                 + "font-size: " + 10 * Theme.getScale() / 100 + "; }");
     }
     description.setOpaque(false);

app/src/cc/arduino/view/SplashScreenHelper.java

@@ -51,8 +51,12 @@ public class SplashScreenHelper {
 
   public SplashScreenHelper(SplashScreen splash) {
     this.splash = splash;
-    Toolkit tk = Toolkit.getDefaultToolkit();
-    desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
+    if (splash != null) {
+      Toolkit tk = Toolkit.getDefaultToolkit();
+      desktopHints = (Map) tk.getDesktopProperty("awt.font.desktophints");
+    } else {
+      desktopHints = null;
+    }
   }
 
   public void splashText(String text) {