Merge branch 'develop' into features/JAL-2295setChimeraAttributes
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Dec 2016 15:17:37 +0000 (15:17 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 2 Dec 2016 15:17:37 +0000 (15:17 +0000)
commitabd0918cc633b946cfea588ef4b4d666edf9fc8b
tree65bef8f581292140114d21bb4cc1771d422d8e5a
parent76f97715b6ea0cd81f8b8176988e0b9b09a66a3d
parent17fa35af8bae6956fdee231e10ef5928f34ca810
Merge branch 'develop' into features/JAL-2295setChimeraAttributes

Conflicts:
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/ext/edu/ucsf/rbvi/strucviz2/ChimeraManager.java
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/gui/JalviewChimeraBindingModel.java