Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 23 Nov 2016 10:03:07 +0000 (10:03 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 23 Nov 2016 10:03:07 +0000 (10:03 +0000)
commit7d8f40032746ee633dd980d5609c4d517a40421a
tree40113dfe58b71bc695f9889a4e068a1b280b34b3
parent8e5fa38447bcb8541c71bd7491c16a96f80fabc2
parent6168111321deafec25337c6c59210f14f857041d
Merge branch 'develop' into features/JAL-2295setChimeraAttributes

Conflicts:
src/jalview/structure/StructureSelectionManager.java
resources/lang/Messages.properties
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/structure/StructureSelectionManager.java