From: Jim Procter Date: Fri, 6 Mar 2015 15:40:33 +0000 (+0000) Subject: Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=e309b8d9bd62fb304fdd612c7385e76027d2f2d7;p=jalview.git Merge branch 'develop' into features/JAL-845splitPaneMergeDevelop JAL-1645 bring JAL-845 feature branch up to date ready for develop merge Conflicts: src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java test/jalview/analysis/DnaTranslation.java --- e309b8d9bd62fb304fdd612c7385e76027d2f2d7