git://source.jalview.org / jalview.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c11bf53 ab43013)
Merge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 14:44:39 +0000 (14:44 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Fri, 6 Mar 2015 14:44:39 +0000 (14:44 +0000)
commit25aaaa87042b3f507ad4348120df7dd073182759
tree1b2487ae6d3410eb77ddfa1a8a4bf53c29c101c4tree | snapshot
parentc11bf53de13301b5774654d5164b29632e141f9fcommit | diff
parentab43013b7e357b84b4abade0dba949668dfb2a0ecommit | diff
Merge commit 'ab43013b7e357b84b4abade0dba949668dfb2a0e' into develop
131 files changed:
build.xml diff1 | diff2 | blob | history
examples/applets.html diff1 | diff2 | blob | history
examples/embedded.html diff1 | diff2 | blob | history
examples/embeddedWJmol.html diff1 | diff2 | blob | history
examples/formComplete.html diff1 | diff2 | blob | history
examples/javascriptLaunch.html diff1 | diff2 | blob | history
examples/linkedapplets_ng.html diff1 | diff2 | blob | history
help/help.jhm diff1 | diff2 | blob | history
help/helpTOC.xml diff1 | diff2 | blob | history
help/html/features/annotationsFormat.html diff1 | diff2 | blob | history
help/html/menus/alwselect.html diff1 | diff2 | blob | history
help/html/releases.html diff1 | diff2 | blob | history
src/MCview/AppletPDBCanvas.java diff1 | diff2 | blob | history
src/MCview/PDBCanvas.java diff1 | diff2 | blob | history
src/jalview/analysis/AlignSeq.java diff1 | diff2 | blob | history
src/jalview/analysis/Conservation.java diff1 | diff2 | blob | history
src/jalview/analysis/Finder.java diff1 | diff2 | blob | history
src/jalview/analysis/Grouping.java diff1 | diff2 | blob | history
src/jalview/analysis/NJTree.java diff1 | diff2 | blob | history
src/jalview/analysis/SequenceIdMatcher.java diff1 | diff2 | blob | history
src/jalview/api/AlignViewControllerGuiI.java diff1 | diff2 | blob | history
src/jalview/api/AlignViewControllerI.java diff1 | diff2 | blob | history
src/jalview/api/AlignViewportI.java diff1 | diff2 | blob | history
src/jalview/api/AlignmentViewPanel.java diff1 | diff2 | blob | history
src/jalview/api/FeatureRenderer.java diff1 | diff2 | blob | history
src/jalview/api/SequenceRenderer.java diff1 | diff2 | blob | history
src/jalview/api/SequenceStructureBinding.java diff1 | diff2 | blob | history
src/jalview/api/structures/JalviewStructureDisplayI.java diff1 | diff2 | blob | history
src/jalview/appletgui/APopupMenu.java diff1 | diff2 | blob | history
src/jalview/appletgui/AlignFrame.java diff1 | diff2 | blob | history
src/jalview/appletgui/AlignViewport.java diff1 | diff2 | blob | history
src/jalview/appletgui/AlignmentPanel.java diff1 | diff2 | blob | history
src/jalview/appletgui/AnnotationColourChooser.java diff1 | diff2 | blob | history
src/jalview/appletgui/AnnotationLabels.java diff1 | diff2 | blob | history
src/jalview/appletgui/AppletJmol.java diff1 | diff2 | blob | history
src/jalview/appletgui/AppletJmolBinding.java diff1 | diff2 | blob | history
src/jalview/appletgui/CutAndPasteTransfer.java diff1 | diff2 | blob | history
src/jalview/appletgui/ExtJmol.java diff1 | diff2 | blob | history
src/jalview/appletgui/FeatureColourChooser.java diff1 | diff2 | blob | history
src/jalview/appletgui/FeatureRenderer.java diff1 | diff2 | blob | history
src/jalview/appletgui/FeatureSettings.java diff1 | diff2 | blob | history
src/jalview/appletgui/Finder.java diff1 | diff2 | blob | history
src/jalview/appletgui/IdCanvas.java diff1 | diff2 | blob | history
src/jalview/appletgui/OverviewPanel.java diff1 | diff2 | blob | history
src/jalview/appletgui/ScalePanel.java diff1 | diff2 | blob | history
src/jalview/appletgui/SeqCanvas.java diff1 | diff2 | blob | history
src/jalview/appletgui/SeqPanel.java diff1 | diff2 | blob | history
src/jalview/appletgui/SequenceRenderer.java diff1 | diff2 | blob | history
src/jalview/appletgui/TreePanel.java diff1 | diff2 | blob | history
src/jalview/bin/Jalview.java diff1 | diff2 | blob | history
src/jalview/bin/JalviewLite.java diff1 | diff2 | blob | history
src/jalview/controller/AlignViewController.java diff1 | diff2 | blob | history
src/jalview/datamodel/Alignment.java diff1 | diff2 | blob | history
src/jalview/datamodel/AlignmentView.java diff1 | diff2 | blob | history
src/jalview/datamodel/CigarArray.java diff1 | diff2 | blob | history
src/jalview/datamodel/ColumnSelection.java diff1 | diff2 | blob | history
src/jalview/datamodel/PDBEntry.java diff1 | diff2 | blob | history
src/jalview/datamodel/Sequence.java diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceCollectionI.java diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceGroup.java diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceI.java diff1 | diff2 | blob | history
src/jalview/ext/jmol/JalviewJmolBinding.java diff1 | diff2 | blob | history
src/jalview/ext/rbvi/chimera/ChimeraCommands.java diff1 | diff2 | blob | history
src/jalview/ext/rbvi/chimera/JalviewChimeraBinding.java diff1 | diff2 | blob | history
src/jalview/ext/varna/JalviewVarnaBinding.java diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java diff1 | diff2 | blob | history
src/jalview/gui/AlignmentPanel.java diff1 | diff2 | blob | history
src/jalview/gui/AnnotationColourChooser.java diff1 | diff2 | blob | history
src/jalview/gui/AnnotationExporter.java diff1 | diff2 | blob | history
src/jalview/gui/AnnotationLabels.java diff1 | diff2 | blob | history
src/jalview/gui/AnnotationPanel.java diff1 | diff2 | blob | history
src/jalview/gui/AppJmol.java diff1 | diff2 | blob | history
src/jalview/gui/AppJmolBinding.java diff1 | diff2 | blob | history
src/jalview/gui/ChimeraViewFrame.java diff1 | diff2 | blob | history
src/jalview/gui/Desktop.java diff1 | diff2 | blob | history
src/jalview/gui/FeatureColourChooser.java diff1 | diff2 | blob | history
src/jalview/gui/FeatureRenderer.java diff1 | diff2 | blob | history
src/jalview/gui/FeatureSettings.java diff1 | diff2 | blob | history
src/jalview/gui/Finder.java diff1 | diff2 | blob | history
src/jalview/gui/FontChooser.java diff1 | diff2 | blob | history
src/jalview/gui/IdCanvas.java diff1 | diff2 | blob | history
src/jalview/gui/IdPanel.java diff1 | diff2 | blob | history
src/jalview/gui/IdwidthAdjuster.java diff1 | diff2 | blob | history
src/jalview/gui/Jalview2XML.java diff1 | diff2 | blob | history
src/jalview/gui/Jalview2XML_V1.java diff1 | diff2 | blob | history
src/jalview/gui/JvSwingUtils.java diff1 | diff2 | blob | history
src/jalview/gui/OverviewPanel.java diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.java diff1 | diff2 | blob | history
src/jalview/gui/Preferences.java diff1 | diff2 | blob | history
src/jalview/gui/RedundancyPanel.java diff1 | diff2 | blob | history
src/jalview/gui/ScalePanel.java diff1 | diff2 | blob | history
src/jalview/gui/ScriptWindow.java diff1 | diff2 | blob | history
src/jalview/gui/SeqCanvas.java diff1 | diff2 | blob | history
src/jalview/gui/SeqPanel.java diff1 | diff2 | blob | history
src/jalview/gui/SequenceRenderer.java diff1 | diff2 | blob | history
src/jalview/gui/SliderPanel.java diff1 | diff2 | blob | history
src/jalview/gui/SplashScreen.java diff1 | diff2 | blob | history
src/jalview/gui/StructureViewer.java diff1 | diff2 | blob | history
src/jalview/gui/TreePanel.java diff1 | diff2 | blob | history
src/jalview/io/AnnotationFile.java diff1 | diff2 | blob | history
src/jalview/io/AppletFormatAdapter.java diff1 | diff2 | blob | history
src/jalview/io/FeaturesFile.java diff1 | diff2 | blob | history
src/jalview/io/FileLoader.java diff1 | diff2 | blob | history
src/jalview/io/FileParse.java diff1 | diff2 | blob | history
src/jalview/io/FormatAdapter.java diff1 | diff2 | blob | history
src/jalview/io/HTMLOutput.java diff1 | diff2 | blob | history
src/jalview/io/IdentifyFile.java diff1 | diff2 | blob | history
src/jalview/io/JalviewFileChooser.java diff1 | diff2 | blob | history
src/jalview/io/SequenceAnnotationReport.java diff1 | diff2 | blob | history
src/jalview/io/VamsasAppDatastore.java diff1 | diff2 | blob | history
src/jalview/io/packed/ParsePackedSet.java diff1 | diff2 | blob | history
src/jalview/javascript/MouseOverStructureListener.java diff1 | diff2 | blob | history
src/jalview/jbgui/GAlignFrame.java diff1 | diff2 | blob | history
src/jalview/jbgui/GFinder.java diff1 | diff2 | blob | history
src/jalview/jbgui/GPreferences.java diff1 | diff2 | blob | history
src/jalview/jbgui/GStructureViewer.java diff1 | diff2 | blob | history
src/jalview/schemes/AnnotationColourGradient.java diff1 | diff2 | blob | history
src/jalview/schemes/Blosum62ColourScheme.java diff1 | diff2 | blob | history
src/jalview/schemes/ResidueProperties.java diff1 | diff2 | blob | history
src/jalview/structures/models/SequenceStructureBindingModel.java diff1 | diff2 | blob | history
src/jalview/util/ColorUtils.java diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java diff1 | diff2 | blob | history
src/jalview/ws/AWSThread.java diff1 | diff2 | blob | history
src/jalview/ws/HttpClientUtils.java diff1 | diff2 | blob | history
src/jalview/ws/jws2/AADisorderClient.java diff1 | diff2 | blob | history
src/jalview/ws/rest/params/AnnotationFile.java diff1 | diff2 | blob | history
test/jalview/io/AnnotationFileIOTest.java diff1 | diff2 | blob | history
test/jalview/ws/jabaws/DisorderAnnotExportImport.java diff1 | diff2 | blob | history
test/jalview/ws/jabaws/JpredJabaStructExportImport.java diff1 | diff2 | blob | history
test/jalview/ws/jabaws/RNAStructExportImport.java diff1 | diff2 | blob | history