Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 7 Aug 2019 13:19:17 +0000 (14:19 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 7 Aug 2019 13:19:17 +0000 (14:19 +0100)
commit5c6564f903f75960af960720a8635ab8709afc37
tree14fe660bf840273941dfb18b448a04baf485706e
parent6bf5604d306cbcd55289639967411ddbafcac682
parent5ce7f678c611cdb0d60a578b81680493cb649824
Merge branch 'develop' into feature/JAL-3390hideUnmappedStructure

Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
gradle.properties
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/ext/jmol/JalviewJmolBinding.java
src/jalview/ext/rbvi/chimera/ChimeraCommands.java
src/jalview/gui/JalviewChimeraBindingModel.java
src/jalview/structures/models/AAStructureBindingModel.java
test/jalview/ext/rbvi/chimera/ChimeraCommandsTest.java
utils/testnglibs/testng-sources.jar