Merge branch 'master' of https://github.com/jettisonjoe/chatty into j…

…ettisonjoe-master Conflicts: src/chatty/gui/components/settings/FontChooser.java
aullik · Apr 19, 2016 · 1650609 · 1650609
2 parents 535b88d + 46bb5bd
commit 1650609
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/src/chatty/gui/components/settings/FontChooser.java b/src/chatty/gui/components/settings/FontChooser.java
@@ -52,7 +52,7 @@ public class FontChooser extends JDialog implements InputListListener,
     private static final int FALLBACK_FONT_SIZE = 14;
     private String[] fontSizes = new String[]{
         "8", "9", "10", "11", "12", "13", "14", "15", "16", "18", "20", "22",
-        "24", "26", "28", "30", "32"
+        "24", "26", "28", "30", "32", "36", "48", "60", "72"
     };
 
     // Reference