git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 7dca281 7294fd3)
Fixes for JInternalFrame, JAXB, String
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 20:36:41 +0000 (14:36 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 23:41:57 +0000 (17:41 -0600)
1  2 
swingjs/SwingJS-site.zip patch | diff1 | diff2 | blob | history
swingjs/timestamp patch | diff1 | diff2 | blob | history
swingjs/ver/3.2.4/SwingJS-site.zip patch | diff1 | diff2 | blob | history
swingjs/ver/3.2.4/timestamp patch | diff1 | diff2 | blob | history

diff --cc swingjs/SwingJS-site.zip
index 4e04670,e69de29..d90d3a5
Binary files differ
diff --cc swingjs/timestamp
index 3238936,0cd7c32..d27afc8
--- 1/swingjs/timestamp
--- 2/swingjs/timestamp
+++ b/swingjs/timestamp
@@@ -1,1 -1,5 +1,1 @@@
- 20181111143118 
 -<<<<<<< HEAD
 -20181111143118 
 -=======
 -20181111141107 
 ->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
++20181111173729 
diff --cc swingjs/ver/3.2.4/SwingJS-site.zip
index 4e04670,e69de29..d90d3a5
Binary files differ
diff --cc swingjs/ver/3.2.4/timestamp
index 3238936,0cd7c32..d27afc8
--- 1/swingjs/ver/3.2.4/timestamp
--- 2/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@@ -1,1 -1,5 +1,1 @@@
- 20181111143118 
 -<<<<<<< HEAD
 -20181111143118 
 -=======
 -20181111141107 
 ->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
++20181111173729