Merge branch 'bug/JAL-3003epsWithSelection' into trialMerge
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 31 Aug 2018 08:49:55 +0000 (09:49 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Fri, 31 Aug 2018 08:49:55 +0000 (09:49 +0100)
commit5868e783b29bd469627b931d6b5749c938823eb7
tree7353a89fcc51802729a0477265a32e2c6dd2b920
parent2dc113b7f55163a5948375d6965f428276a57593
parentbb5ca6096768a8e57a3c3158469e5eba7cabcfdb
Merge branch 'bug/JAL-3003epsWithSelection' into trialMerge

Conflicts:
src/jalview/gui/SeqCanvas.java
.settings/org.eclipse.jdt.ui.prefs
src/jalview/gui/SeqCanvas.java