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)
commit7461d83d08001a8cd400125fe841a013ca8057f4
tree5ddccf54389bac4d4a42c920dfa83ac35ef90f02
parenta207f4080b01543b48b80f6f3eb331b75b63bdc6
parent6936b57e5469c796a998d661a7a07648832ccf70
merge
src/jalview/gui/AlignFrame.java
src/jalview/io/JSONFile.java