Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/featu...
authorkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 25 Oct 2017 14:51:38 +0000 (15:51 +0100)
committerkjvdheide <kjvanderheide@dundee.ac.uk>
Wed, 25 Oct 2017 14:51:38 +0000 (15:51 +0100)
commita94f60273c1c21fda47b1a599a17e4fc920fe4a3
tree9df889c8137ad2e0de1a3077a4af2614d9f4f2a6
parentfcee2b6dcede8ef7fa07a9cf777194da8c88fe79
parent7d9416d5ef085fa7e364fa73e181aeeeda53db47
Merge branch 'develop' of https://source.jalview.org/git/jalview.git into kjvdh/features/PhylogenyViewer
src/jalview/gui/Desktop.java