Merge branch 'develop' into features/JAL-1812_JAL-2083_groovyBinding features/JAL-1812_JAL-2083_groovyBinding
authorJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 09:53:46 +0000 (10:53 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Mon, 20 Jun 2016 09:53:46 +0000 (10:53 +0100)
commit8c7fd90d480e2671e0fa251ada3c89fa1d18862a
tree50ac3d6409a488b23e5ace1c9c497511529de806
parentea7b9666447dea727e9d607de3694cfe27bc811e
parentb3f1f3a43cb1fd27206b27ad6387440dc3a4e253
Merge branch 'develop' into features/JAL-1812_JAL-2083_groovyBinding
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/bin/Jalview.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/Desktop.java