git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 3542c42)
JAL-3026-JAL-3063 menu fonts
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sat, 17 Nov 2018 20:37:50 +0000 (14:37 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sat, 17 Nov 2018 20:37:50 +0000 (14:37 -0600)
swingjs/SwingJS-site.zip patch | blob | history
swingjs/timestamp patch | blob | history
swingjs/ver/3.2.4/SwingJS-site.zip patch | blob | history
swingjs/ver/3.2.4/timestamp patch | blob | history

diff --git a/swingjs/SwingJS-site.zip b/swingjs/SwingJS-site.zip
index c0fc479..8f0c45d 100644 (file)
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 (file)
--- 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 (file)
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 (file)
--- 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