Merge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:41:54 +0000 (14:41 +0100)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 26 Apr 2017 13:41:54 +0000 (14:41 +0100)
commit14dfbaf6a266c6d5789f1f113b63a33a435ea0b2
treef1b2481cabe00671ecd6ed43cbff14fc69519dfd
parentb70c7ff4b002103401ccceb917114b954e18d50c
parent8537d486848be3e97578248dae6bede12e343fe1
Merge remote-tracking branch 'origin/develop' into features/JAL-2388hiddencolumnschanges
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java
src/jalview/io/JSONFile.java
test/jalview/io/JSONFileTest.java