Merge branch 'features/JAL-2360colourSchemeApplicability' into features/JAL-2371colle...

author gmungoc <g.m.carstairs@dundee.ac.uk>

Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)

committer gmungoc <g.m.carstairs@dundee.ac.uk>

Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)
author gmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)
committer gmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)
diff --cc src/jalview/appletgui/APopupMenu.java
Simple merge
diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge
author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Tue, 17 Jan 2017 13:32:33 +0000 (13:32 +0000)
		1	2
src/jalview/appletgui/APopupMenu.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/appletgui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/PopupMenu.java	patch \|	diff1 \|	diff2 \|	blob \| history