Merge branch 'develop' into features/JAL-1759jmolUpdate
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Wed, 1 Jul 2015 11:05:43 +0000 (12:05 +0100)
commit2a36d880a6a221c6a46f4a24d10539073e40106d
tree8cadcfd877801bc66697f652d83396798caccc45
parentc37b687de83b672fb6585db5fcd93189e3582139
parentc54d46db524f1acf7cf4659a9603bbe50518440f
Merge branch 'develop' into features/JAL-1759jmolUpdate
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/Desktop.java
src/jalview/gui/PopupMenu.java