Merge branch 'develop' into features/JAL-1759jmolUpdate

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

Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)

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

Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
author gmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
committer gmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/gui/Desktop.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge
author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
		1	2
src/jalview/appletgui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/AlignViewport.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Desktop.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/PopupMenu.java	patch \|	diff1 \|	diff2 \|	blob \| history