Merge remote-tracking branch 'origin/develop' into features/JAL-2316
authorkiramt <k.mourao@dundee.ac.uk>
Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
committerkiramt <k.mourao@dundee.ac.uk>
Mon, 9 Jan 2017 11:47:12 +0000 (11:47 +0000)
commitf4198275905d9a1b30eecb293288eaae9587c749
tree5b39c8b3da70a7bc7ddc2500e7b6b526f2240d1c
parent40f8e76e5d28e2c2fe5fddab72fe797a696bed8a
parent976c518ffa15791c680156dd357d33f5a06c3a54
Merge remote-tracking branch 'origin/develop' into features/JAL-2316
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/APopupMenu.java