merge
authortcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 8 Oct 2015 10:09:41 +0000 (11:09 +0100)
committertcofoegbu <tcnofoegbu@dundee.ac.uk>
Thu, 8 Oct 2015 10:09:41 +0000 (11:09 +0100)
1  2 
src/jalview/gui/AlignFrame.java
src/jalview/io/JSONFile.java

Simple merge
Simple merge