Merge remote-tracking branch 'origin/merge/JAL-845_JAL-1640' into
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 12 Feb 2015 09:33:05 +0000 (09:33 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 12 Feb 2015 09:33:05 +0000 (09:33 +0000)
commitd10280f7592e21f1ed4d1030d3ece3e95f3b385b
treee647ad48cedac19617b1d8a131e40cf4dfa9bf34
parentcc6d26d2738c5854ef81ce6787d66564c2281220
parent6a9cf7ddfdb65e38e8caa2d760877725b7f7bae0
Merge remote-tracking branch 'origin/merge/JAL-845_JAL-1640' into
features/JAL-845splitPaneMergeDevelop

Conflicts:
src/jalview/gui/Desktop.java
.classpath
resources/lang/Messages.properties
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/Desktop.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SplitFrame.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/jbgui/GSplitFrame.java
src/jalview/ws/rest/RestServiceDescription.java