Merge branch 'develop' into features/JAL-892varnaToProject
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jun 2015 14:50:57 +0000 (15:50 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 26 Jun 2015 14:50:57 +0000 (15:50 +0100)
commitba0bedafc61f5e83fa5a34f8ddbd0cd5222abe0e
treeffacd77ca9c3e369f0859621511aef4930dec910
parent21fccb30635d61dbf7ad0f266a88f07fb87358f7
parent6296524c4ccada42516aac9a85398170f5a3bc5d
Merge branch 'develop' into features/JAL-892varnaToProject
.classpath
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/PopupMenu.java