Merge branch 'features/typed_annotations_calcId' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 12:41:52 +0000 (12:41 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 12:41:52 +0000 (12:41 +0000)
commit8d98d7ffc5c6ad61d7ff662fb88692c23a9791e5
treeb7c40a67cb8ab6bbdbdd143c108e438bfa490997
parent95f6ef5142fb82c4f3a781954eeaff7694f42f0b
parent03496bf88fc1bec3ce628ac79ce69440ce244007
Merge branch 'features/typed_annotations_calcId' into develop
src/jalview/gui/AlignFrame.java
src/jalview/jbgui/GAlignFrame.java