Merge remote-tracking branch 'origin/Jalview-BH/JAL-3048_dialogs' into Jalview-BH...
authorhansonr <hansonr@stolaf.edu>
Tue, 3 Jul 2018 09:19:08 +0000 (10:19 +0100)
committerhansonr <hansonr@stolaf.edu>
Tue, 3 Jul 2018 09:19:08 +0000 (10:19 +0100)
commit954af328a2a6a0055572cd1a09ee035301222574
treec7cbd40475c1712bc25a85be93444e18b080866d
parent79d2d1087d5a8a8242a6bc9ba9e2695059504669
parent6ec871abfdeca0c40d2821bbff4839dbfb28d121
Merge remote-tracking branch 'origin/Jalview-BH/JAL-3048_dialogs' into Jalview-BH/JAL-3026
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java