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