Merge branch 'docs/2_8_1_Release' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 5 Jun 2014 10:46:39 +0000 (11:46 +0100)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 5 Jun 2014 10:46:39 +0000 (11:46 +0100)
commit0e2054d29bc49351f000d478659dc3c4371b251c
tree9169cbfff6edaba896ad0286d00354fc799c7486
parentfca189f1ddefa155881dedeeb0f21c1cd0905e74
parentdbc8ffccfdd7ff6f028ef8496e168219bd49ec8a
Merge branch 'docs/2_8_1_Release' into Release_2_8_2_Branch
JAL-1517 JAL-1503 merge 2.8.1 source code updates to 2_8_2 branch
Conflicts:
RELEASE
build.xml
src/jalview/ext/varna/VarnaCommands.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/StockholmFile.java
35 files changed:
build.xml
src/MCview/PDBViewer.java
src/MCview/PDBfile.java
src/jalview/analysis/AlignSeq.java
src/jalview/analysis/Rna.java
src/jalview/analysis/StructureFrequency.java
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/Jalview.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/Annotation.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/gui/AppVarna.java
src/jalview/gui/AppVarnaBinding.java
src/jalview/gui/AssociatePdbFileWithSeq.java
src/jalview/gui/Desktop.java
src/jalview/gui/PopupMenu.java
src/jalview/io/AlignFile.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FastaFile.java
src/jalview/io/FeaturesFile.java
src/jalview/io/FileLoader.java
src/jalview/io/IdentifyFile.java
src/jalview/io/JPredFile.java
src/jalview/io/PfamFile.java
src/jalview/io/PileUpfile.java
src/jalview/io/StockholmFile.java
src/jalview/io/TCoffeeScoreFile.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/jbgui/GDesktop.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/schemes/ColourSchemeProperty.java
src/jalview/schemes/ResidueProperties.java
src/jalview/util/DBRefUtils.java
src/jalview/ws/dbsources/Pdb.java