git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 990ed4f da1ce6c)
Merge branch 'Jalview-JS/JAL-3253-applet' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Wed, 22 May 2019 13:15:03 +0000 (08:15 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Wed, 22 May 2019 13:15:03 +0000 (08:15 -0500)
commit6a0e26c77c243635ea2a5d203b0bede80b0f4096
treecc8b7bbd64c9f83061fc89cd66a44a9ae5bc625atree | snapshot
parent990ed4ffbaa7a95b2ebb6bf6ab0440310f6e83abcommit | diff
parentda1ce6ca071deb35b983a41f6eeed43f30b3c3b2commit | diff
Merge branch 'Jalview-JS/JAL-3253-applet' of
https://source.jalview.org/git/jalview.git into
Jalview-JS/JAL-3253-applet

Conflicts:
src/jalview/project/Jalview2XML.java
src/jalview/project/Jalview2XML.java diff1 | diff2 | blob | history