Merge remote-tracking branch 'origin/features/JAL-2388hiddencolumnschanges' into...

author kiramt <k.mourao@dundee.ac.uk>

Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)

committer kiramt <k.mourao@dundee.ac.uk>

Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)
author kiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)
committer kiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)
diff --cc src/jalview/appletgui/SeqPanel.java
Simple merge
diff --cc src/jalview/datamodel/HiddenColumns.java
Simple merge
diff --cc src/jalview/gui/SeqPanel.java
Simple merge
diff --cc test/jalview/datamodel/ColumnSelectionTest.java
Simple merge
author	kiramt <k.mourao@dundee.ac.uk>
	Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)
committer	kiramt <k.mourao@dundee.ac.uk>
	Wed, 26 Apr 2017 13:35:49 +0000 (14:35 +0100)
		1	2
src/jalview/appletgui/SeqPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/datamodel/HiddenColumns.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/SeqPanel.java	patch \|	diff1 \|	diff2 \|	blob \| history
test/jalview/datamodel/ColumnSelectionTest.java	patch \|	diff1 \|	diff2 \|	blob \| history