merge commit
authorCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Nov 2014 17:49:58 +0000 (17:49 +0000)
committerCharles Ofoegbu <tcnofoegbu@dundee.ac.uk>
Tue, 25 Nov 2014 17:49:58 +0000 (17:49 +0000)
commit341e759bcdf94d50e58217f55a87f25a44eeef54
treed2e5d207026ab012b86fe42b84112ed44be51000
parent35bef7106ec457c8240eb0656b0901c77cf362da
parentb8810711642d8473325c8a3d3e76cc5c3c9b5bbd
merge commit
.classpath
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/FeatureSettings.java
src/jalview/gui/SeqPanel.java