Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support
authorJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:33:17 +0000 (16:33 +0100)
committerJim Procter <j.procter@dundee.ac.uk>
Mon, 6 Oct 2014 15:33:17 +0000 (16:33 +0100)
commitbdba25716eaa9492681532cb443c18ed34237488
tree1a750d26fadfe8731494a11019f5f57fd8724648
parent77abb3fac2965a8966410cd77cd749c7c1dc6453
parentdeff1a0f2a6dbcf087b4f6541e2fc7284a382b66
Merge branch 'Release_2_8_2_Branch' into JAL-429_phylip-file-support

Conflicts:
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FileParse.java
src/jalview/io/JalviewFileChooser.java