Merge branch 'alpha/origin_2022_JAL-3066_Jalview_212_slivka-integration' into spike...
authorJim Procter <j.procter@dundee.ac.uk>
Tue, 13 Dec 2022 17:29:01 +0000 (17:29 +0000)
committerJim Procter <j.procter@dundee.ac.uk>
Tue, 13 Dec 2022 17:29:01 +0000 (17:29 +0000)
commit49db0dff1da16c3355b43a41498c1fc93ef47e91
tree933b52506d78da4c5e88b82f477853606c1ff1bb
parent304e64fb34b32659be1bbfd39fb4e15b2f79586e
parentdce490b7c7c8f2c2021f7dd93ba126af0c6eaf43
Merge branch 'alpha/origin_2022_JAL-3066_Jalview_212_slivka-integration' into spike/jims/dec_2022_2112_to_212_JAL-3066_slikva_integration

 Conflicts:
src/jalview/bin/Cache.java
src/jalview/ws/jws2/JPredThread.java
src/jalview/ws/slivkaws/SlivkaJPredServiceInstance.java
src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
src/jalview/ws/slivkaws/SlivkaWSInstance.java
swingjs/ver/3.3.1/SwingJS-site.zip
swingjs/ver/3.3.1/timestamp
15 files changed:
src/jalview/bin/Cache.java
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/AnnotationRowFilter.java
src/jalview/gui/Preferences.java
src/jalview/io/AnnotationFile.java
src/jalview/io/SequenceAnnotationReport.java
src/jalview/jbgui/GPreferences.java
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/ws/jws1/JPredClient.java
src/jalview/ws/jws2/SequenceAnnotationWSClient.java
src/jalview/ws/slivkaws/SlivkaMsaServiceInstance.java
src/jalview/ws/slivkaws/SlivkaWSDiscoverer.java
test/jalview/ws/jabaws/DisorderAnnotExportImport.java