Merge branch 'develop' into features/JAL-892varnaToProject
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 3 Jul 2015 10:18:22 +0000 (11:18 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 3 Jul 2015 10:18:22 +0000 (11:18 +0100)
commite373651097c72eb6c9ca6009fb70d47341e8f405
tree80a9bc5b58ab33726aa18086e59b481d7fc8180e
parent528dcd143968fc270232e4cec64a79b447aa5ec6
parent4f6267811207426a9670a89c875e74a634e544e9
Merge branch 'develop' into features/JAL-892varnaToProject
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/PopupMenu.java