Merge branch 'develop' into features/JAL-653_gffalignments features/JAL-653_gffalignments
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 15:35:29 +0000 (16:35 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 15:35:29 +0000 (16:35 +0100)
commit2a9991ef1eb02d97e9c8ed1644f292117ae6f600
tree077697abc0efb3f8d83d5982bb32026b62efc12a
parent2ce465aaa3047e1ef758a26af2fbfcf8626b4a69
parentf3b9ee1c57282a1233ffec89ec5aae39dc29d25f
Merge branch 'develop' into features/JAL-653_gffalignments
update for incoming changes and finessing against JAL-1641
src/jalview/appletgui/AlignFrame.java
src/jalview/datamodel/Sequence.java
src/jalview/gui/AlignFrame.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FileLoader.java