Merge branch 'develop' into task/JAL-2196pdbeProperties

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

Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)

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

Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
author gmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
committer gmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
diff --cc src/MCview/PDBViewer.java
Simple merge
diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/Jalview2XML.java
Simple merge
diff --cc src/jalview/io/StructureFile.java
Simple merge
diff --cc src/jalview/ws/dbsources/Uniprot.java
Simple merge
diff --cc test/jalview/ws/dbsources/UniprotTest.java
Simple merge
author	gmungoc <g.m.carstairs@dundee.ac.uk>
	Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
committer	gmungoc <g.m.carstairs@dundee.ac.uk>
	Thu, 6 Oct 2016 12:53:37 +0000 (13:53 +0100)
		1	2
src/MCview/PDBViewer.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/appletgui/AlignFrame.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/gui/Jalview2XML.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/io/StructureFile.java	patch \|	diff1 \|	diff2 \|	blob \| history
src/jalview/ws/dbsources/Uniprot.java	patch \|	diff1 \|	diff2 \|	blob \| history
test/jalview/ws/dbsources/UniprotTest.java	patch \|	diff1 \|	diff2 \|	blob \| history