Merge branch 'develop' into features/JAL-2110_crossRefDuplications features/JAL-2110_crossRefDuplications
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 9 Jul 2016 06:12:09 +0000 (07:12 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Sat, 9 Jul 2016 06:12:09 +0000 (07:12 +0100)
commit4eb1ed22600411fe5b6e9ac93084b45429ccfad6
tree60e2fdfac738131ae8b2ee0bc624af5d95ff4aa7
parentd2b08d9048af25114cff8deabbd320471119d88d
parent0bec4854366c4bc4608ed0d7dc1506fc6afe2285
Merge branch 'develop' into features/JAL-2110_crossRefDuplications
test/jalview/gui/AlignViewportTest.java
test/jalview/structure/StructureSelectionManagerTest.java