git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: a5af7a3)
Merge branch 'Jalview-BH/JAL-3026' of
authorhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)
committerhansonr <hansonr@STO24954W.ad.stolaf.edu>
Tue, 21 Aug 2018 18:30:37 +0000 (13:30 -0500)
https://source.jalview.org/git/jalview.git into Jalview-BH/JAL-3026

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


No differences found