git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e98f12 f03b7f8)
Merge branch 'Jalview-BH/JAL-3026-JAL-3063-JAXB' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 20:35:27 +0000 (14:35 -0600)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Sun, 11 Nov 2018 20:36:14 +0000 (14:36 -0600)
https://source.jalview.org/git/jalview.git into
Jalview-BH/JAL-3026-JAL-3063-JAXB

Conflicts:
swingjs/SwingJS-site.zip
swingjs/timestamp
swingjs/ver/3.2.4/SwingJS-site.zip
swingjs/ver/3.2.4/timestamp


Trivial merge