Merge branch 'feature/JAL-1713_overviewInProject' into bug/JAL-3785autoOverviewTitle

author Jim Procter <j.procter@dundee.ac.uk>

Mon, 7 Feb 2022 17:13:49 +0000 (17:13 +0000)

committer Jim Procter <j.procter@dundee.ac.uk>

Mon, 7 Feb 2022 17:13:49 +0000 (17:13 +0000)
author Jim Procter <j.procter@dundee.ac.uk>
Mon, 7 Feb 2022 17:13:49 +0000 (17:13 +0000)
committer Jim Procter <j.procter@dundee.ac.uk>
Mon, 7 Feb 2022 17:13:49 +0000 (17:13 +0000)
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignmentPanel.java
Simple merge
diff --cc src/jalview/io/FileLoader.java
Simple merge
diff --cc src/jalview/project/Jalview2XML.java
Simple merge
diff --cc test/jalview/project/Jalview2xmlTests.java
Simple merge
author	Jim Procter <j.procter@dundee.ac.uk>
	Mon, 7 Feb 2022 17:13:49 +0000 (17:13 +0000)
committer	Jim Procter <j.procter@dundee.ac.uk>
	Mon, 7 Feb 2022 17:13:49 +0000 (17:13 +0000)
		1	2
src/jalview/gui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignmentPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/io/FileLoader.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/project/Jalview2XML.java	patch \|	diff1 \|	diff2 \|	blob \| history
test/jalview/project/Jalview2xmlTests.java	patch \|	diff1 \|	diff2 \|	blob \| history