Merge branch 'JAL-1569_wuss_vienna_broke' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 24 Nov 2014 22:17:51 +0000 (22:17 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 24 Nov 2014 22:17:51 +0000 (22:17 +0000)
commit35bef7106ec457c8240eb0656b0901c77cf362da
tree8e687235f668d1a4399af5987a8bce7a90b9ff47
parent99ece0eec17dfa6afa515adb441f280a2fcf26cc
parent879293251d1072b24403df2f4bf3ac6a69d4a012
Merge branch 'JAL-1569_wuss_vienna_broke' into develop
src/jalview/gui/AlignFrame.java
src/jalview/jbgui/GAlignFrame.java