Merge branch 'releases/Release_2_10_Branch' into task/JAL-2196pdbeProperties task/JAL-2196pdbeProperties
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 14 Oct 2016 10:12:00 +0000 (11:12 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 14 Oct 2016 10:12:00 +0000 (11:12 +0100)
commitf40e44c9db0a689f2df188cf07801b035096c1b1
treedf21d6638ac5066db1f6627f6b9da31b4a0c7329
parent8546ee20c998cd48567d324027d1885a771e688f
parent21be5363b2f7b61aade8a4b4caf54da28d8cd82a
Merge branch 'releases/Release_2_10_Branch' into task/JAL-2196pdbeProperties
src/jalview/appletgui/AppletJmol.java
src/jalview/gui/Jalview2XML.java
src/jalview/structures/models/AAStructureBindingModel.java