Merge branch 'develop' into features/JAL-1152annotationSorting
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 3 Nov 2014 16:02:18 +0000 (16:02 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 3 Nov 2014 16:02:18 +0000 (16:02 +0000)
commit8c0f33de9bd3c211883eddcc313ebc7978f7b0b5
tree058bf1d017df0dfea16751f0d749c12a5a91122d
parent25883b542d1908492cb82041d7dcb16f533e8862
parentc70b1cb43732f143e6292d9080f73230599fced2
Merge branch 'develop' into features/JAL-1152annotationSorting
src/jalview/gui/AlignFrame.java
src/jalview/gui/PopupMenu.java