git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 20f1e88)
JAL-3026-JAL-3063-JAXB marshalling
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Wed, 7 Nov 2018 04:23:56 +0000 (22:23 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Wed, 7 Nov 2018 04:23:56 +0000 (22:23 -0600)
JAXB marshalling/unmarshalling successful
JavaScript marshal -> Java unmarshal
JavaScript marshal -> JavaScript unmarshal
Java marshal -> JavaScript unmarshal

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 e69de29..cc475bd 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 5bd0bac..ddd7e58 100644 (file)
--- a/swingjs/timestamp
+++ b/swingjs/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181105193243 
-=======
-20181101233424 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181106221821 
diff --git a/swingjs/ver/3.2.4/SwingJS-site.zip b/swingjs/ver/3.2.4/SwingJS-site.zip
index e69de29..cc475bd 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 5bd0bac..ddd7e58 100644 (file)
--- a/swingjs/ver/3.2.4/timestamp
+++ b/swingjs/ver/3.2.4/timestamp
@@ -1,5 +1 @@
-<<<<<<< HEAD
-20181105193243 
-=======
-20181101233424 
->>>>>>> branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of https://source.jalview.org/git/jalview.git
+20181106221821