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)
1  2 
src/jalview/gui/Desktop.java

Simple merge