Merge remote-tracking branch 'origin/develop' into features/JAL-2316
authorkiramt <k.mourao@dundee.ac.uk>
Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Thu, 26 Jan 2017 11:40:39 +0000 (11:40 +0000)
commit8358d28676df76a80e4b53af1d7ef2459e4f840b
tree20a5f7c8c7a88fffeababc4495f87a88f79f5324
parent5a94e467b3bc46702d1a5ba4de7808461bb2326f
parent8b844f70b97629d597be49cb6ac0d83c8da007c9
Merge remote-tracking branch 'origin/develop' into features/JAL-2316
resources/lang/Messages.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/gui/Desktop.java
src/jalview/gui/Preferences.java