JAL-1998 JAL-3772 JAL-3416 Merge conflict resolution of JalviewFileChooser and JvOpti...
authorBen Soares <b.soares@dundee.ac.uk>
Fri, 4 Nov 2022 17:53:36 +0000 (17:53 +0000)
committerBen Soares <b.soares@dundee.ac.uk>
Fri, 4 Nov 2022 17:53:36 +0000 (17:53 +0000)
commit952d6b6fecfb976c0c113f013ed2b8980af3d190
tree16cf17922f6992a6ea7d518036b4e4156b4f4982
parentbfc2ccc01fd77463a3edb1265e3ee6db5741f917
parent071a00a0f8ce9892254630595696c1c9d7c39ec7
JAL-1998 JAL-3772 JAL-3416 Merge conflict resolution of JalviewFileChooser and JvOptionPane
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/JvOptionPane.java
src/jalview/gui/StructureViewerBase.java
src/jalview/gui/UserDefinedColours.java
src/jalview/io/JalviewFileChooser.java