Merge branch 'features/JAL-845splitPaneMergeDevelop' into merge_JAL-845_JAL-1640
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Feb 2015 16:06:40 +0000 (16:06 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 9 Feb 2015 16:06:40 +0000 (16:06 +0000)
commite07fc11d5aaf4d1237d83e5f7ea0909dea09902e
tree50481bacaa90c04ce1af3dffecd9725cb7f3179c
parent913c7db3eaf97959bcd34a7e96b64632b622edc8
parent424c56371cd59181b994d7e3e8e91c4b7ba0b507
Merge branch 'features/JAL-845splitPaneMergeDevelop' into merge_JAL-845_JAL-1640
minimal conflicts where list accessors were used in methods where logic
also modified on Desktop

Conflicts:
.classpath
resources/lang/Messages.properties
src/jalview/api/AlignViewportI.java
src/jalview/gui/Desktop.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/TreeCanvas.java
src/jalview/viewmodel/AlignmentViewport.java
23 files changed:
.classpath
resources/lang/Messages.properties
src/jalview/analysis/AlignSeq.java
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/SeqPanel.java
src/jalview/bin/Jalview.java
src/jalview/bin/JalviewLite.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AlignmentPanel.java
src/jalview/gui/AnnotationLabels.java
src/jalview/gui/Desktop.java
src/jalview/gui/IdPanel.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/ScalePanel.java
src/jalview/gui/SeqCanvas.java
src/jalview/gui/SeqPanel.java
src/jalview/gui/TreeCanvas.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/viewmodel/AlignmentViewport.java
test/jalview/io/Jalview2xmlTests.java