Merge branch 'jims_marckhacks' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 16:42:05 +0000 (17:42 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 21 Apr 2014 16:42:05 +0000 (17:42 +0100)
commit5407cbf8c0055ac748b42c8a86097e3d5edec3e7
tree906283e3865d9a06d498c746a5865c1ce1406e92
parent4c17363ea55f58efe7621af2bb7f052948de2cec
parent071b0e962611ba9a4692a1af9d2f10fdf1f694ea
Merge branch 'jims_marckhacks' into develop
src/jalview/appletgui/AlignFrame.java
src/jalview/gui/PopupMenu.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/schemes/ResidueProperties.java