Merge remote-tracking branch 'origin/develop' into features/JAL-2316
authorkiramt <k.mourao@dundee.ac.uk>
Wed, 8 Feb 2017 11:59:19 +0000 (11:59 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Wed, 8 Feb 2017 11:59:19 +0000 (11:59 +0000)
commit77bebd0b42826a8ba2f54293b05ccc1dbfbd6ae7
tree64c1cac79f542109891a08a490dacad748492cdd
parent9d7c487b4a2774d380d0807527e365e9002a1fd5
parente6e92a1314a7b7557401b829846ac55dcffbfbe2
Merge remote-tracking branch 'origin/develop' into features/JAL-2316
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/bin/Cache.java
src/jalview/gui/Preferences.java