Merge branch 'develop' into feature_29/JAL-1372_referenceseq
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 23 Jan 2015 14:06:11 +0000 (14:06 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 23 Jan 2015 14:06:11 +0000 (14:06 +0000)
commitf58113903c158201e64b3db50cc6cd57a8db6ae6
tree5c5ff631fffb98270f8415694b3cda5df7cb9722
parent4884e25f5b34c098cbfe5f207b2a3d938c9b82c4
parent05dae6e20679182b50293ab33705f596f543d720
Merge branch 'develop' into feature_29/JAL-1372_referenceseq
finessing between two branches where bugs are patched twice
Conflicts:
src/jalview/appletgui/ScalePanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/datamodel/ColumnSelection.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/ScalePanel.java
src/jalview/appletgui/SeqCanvas.java
src/jalview/datamodel/ColumnSelection.java