Merge branch 'develop' into Release_2_9_0b1_Branch
authorJim Procter <jprocter@issues.jalview.org>
Tue, 22 Sep 2015 14:19:51 +0000 (15:19 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 22 Sep 2015 14:19:51 +0000 (15:19 +0100)
commit1e085f14ae2f19adfac0153c437ee891f0ad07bc
tree9b200786618896dfe9a5627544c31eed7cd38ae8
parent9876fdccf311378e690c1f9e18db52675d427b89
parent1d9cea0e524085ca1985fb10f70a7ad317062944
Merge branch 'develop' into Release_2_9_0b1_Branch
JAL-1894 update next-release branch for build system
32 files changed:
build.xml
doc/UnitTesting.html
examples/applets.html
examples/javascript/jalview.js
src/jalview/analysis/AlignmentUtils.java
src/jalview/appletgui/AlignFrame.java
src/jalview/appletgui/CutAndPasteTransfer.java
src/jalview/appletgui/SeqPanel.java
src/jalview/appletgui/SplitFrame.java
src/jalview/bin/Cache.java
src/jalview/bin/JalviewLite.java
src/jalview/commands/EditCommand.java
src/jalview/datamodel/AlignedCodonFrame.java
src/jalview/datamodel/Mapping.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/SeqPanel.java
src/jalview/io/BioJsHTMLOutput.java
src/jalview/io/FormatAdapter.java
src/jalview/io/JSONFile.java
src/jalview/javascript/MouseOverStructureListener.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/json/binding/biojson/v1/SequencePojo.java
src/jalview/ws/DBRefFetcher.java
test/jalview/analysis/AlignmentUtilsTests.java
test/jalview/commands/EditCommandTest.java
test/jalview/datamodel/AlignedCodonFrameTest.java
test/jalview/datamodel/AlignedCodonIteratorTest.java
test/jalview/datamodel/AlignmentTest.java
test/jalview/io/Jalview2xmlTests.java
test/jalview/util/MappingUtilsTest.java