Merge remote-tracking branch 'remotes/origin/2_5_1_rna_merge' into develop (JAL-826)
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 4 Oct 2011 15:50:04 +0000 (16:50 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 4 Oct 2011 15:50:04 +0000 (16:50 +0100)
commit2026a420963f094072607c0495b6369ba96e60c0
tree0b46f514a788b68f86843ea818f936ccb29a6c55
parenta831db70f876aaeeb5b36624c9d10816fd8bb7c7
parentaf5f089d166491a0f2c1045f42a79e27eb5a0ba3
Merge remote-tracking branch 'remotes/origin/2_5_1_rna_merge' into develop (JAL-826)

Conflicts:
.classpath
help/html/menus/alignmentMenu.html
help/html/whatsNew.html
src/jalview/gui/PopupMenu.java
42 files changed:
.classpath
help/help.jhm
help/helpTOC.xml
help/html/calculations/consensus.html
help/html/colourSchemes/index.html
help/html/colourSchemes/nucleotide.html
help/html/features/jmol.html
help/html/features/seqfetch.html
help/html/io/fileformats.html
help/html/menus/alignmentMenu.html
help/html/menus/alwcolour.html
help/html/menus/alwfile.html
help/html/whatsNew.html
src/jalview/analysis/Conservation.java
src/jalview/appletgui/AppletJmol.java
src/jalview/commands/EditCommand.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/AlignmentI.java
src/jalview/datamodel/Annotation.java
src/jalview/datamodel/DBRefSource.java
src/jalview/datamodel/SequenceFeature.java
src/jalview/gui/AlignFrame.java
src/jalview/gui/AlignViewport.java
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/AppJmol.java
src/jalview/gui/Desktop.java
src/jalview/gui/SeqPanel.java
src/jalview/io/AlignFile.java
src/jalview/io/AnnotationFile.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/JalviewFileChooser.java
src/jalview/io/StockholmFile.java
src/jalview/jbgui/GAlignFrame.java
src/jalview/jbgui/GStructureViewer.java
src/jalview/schemes/ColourSchemeProperty.java
src/jalview/schemes/ResidueProperties.java
src/jalview/structure/StructureSelectionManager.java
src/jalview/ws/SequenceFetcher.java
src/jalview/ws/dbsources/Pfam.java
src/jalview/ws/dbsources/PfamFull.java
src/jalview/ws/dbsources/PfamSeed.java