From: hansonr <hansonr@STO24954W.ad.stolaf.edu>
Date: Sat, 17 Nov 2018 20:37:50 +0000 (-0600)
Subject: JAL-3026-JAL-3063  menu fonts
X-Git-Tag: Release_2_11_4_0~45^2~18^2~391
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=92de0afb8f650e19b64cbddfa8c32b1119737a8b;p=jalview.git

JAL-3026-JAL-3063  menu fonts
---

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index c0fc479..8f0c45d 100644
Binary files a/swingjs/SwingJS-site.zip and b/swingjs/SwingJS-site.zip differ
diff --git a/swingjs/timestamp b/swingjs/timestamp
index 99e7c15..3986ece 100644
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
+20181117143423 
+=======
 20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index c0fc479..8f0c45d 100644
Binary files a/swingjs/ver/3.2.4/SwingJS-site.zip and b/swingjs/ver/3.2.4/SwingJS-site.zip differ
diff --git a/swingjs/ver/3.2.4/timestamp b/swingjs/ver/3.2.4/timestamp
index 99e7c15..3986ece 100644
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1 +1,5 @@
+<<<<<<< HEAD
+20181117143423 
+=======
 20181117133636 
+>>>>>>> branch 'hanson1' of https://github.com/BobHanson/java2script.git