Merge branch 'develop' into features/JAL-2349_matrixvis
authorJim Procter <jprocter@issues.jalview.org>
Fri, 9 Jun 2017 14:33:17 +0000 (18:33 +0400)
committerJim Procter <jprocter@issues.jalview.org>
Fri, 9 Jun 2017 14:33:17 +0000 (18:33 +0400)
commit09cce494f72431183bd3c37e77913170a08c3ac3
tree71d94a726652392c6b7d64a30fdec875612baf00
parentc007d50b16da69f9a0bab23f8a1afd7347fc7e87
parentbfd6896b97d4ec5c58d7c52079220ff75437c9a9
Merge branch 'develop' into features/JAL-2349_matrixvis
JAL-2349 update for refactor of hidden columns out of column selection
27 files changed:
src/jalview/api/AlignViewportI.java
src/jalview/appletgui/#OverviewPanel.java#
src/jalview/appletgui/AnnotationPanel.java
src/jalview/datamodel/Alignment.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/AlignmentI.java
src/jalview/datamodel/Profile.java~
src/jalview/datamodel/ProfileI.java~
src/jalview/datamodel/Profiles.java~
src/jalview/datamodel/ProfilesI.java~
src/jalview/datamodel/ResidueCount.java~
src/jalview/datamodel/SearchResultMatchI.java~
src/jalview/datamodel/SearchResultsI.java~
src/jalview/ext/jmol/JmolParser.java~
src/jalview/gui/#OverviewPanel.java#
src/jalview/gui/AnnotationPanel.java
src/jalview/gui/SeqCanvas.java.broken
src/jalview/gui/StructureChooser.java~
src/jalview/gui/TreeCanvas.java~
src/jalview/io/AppletFormatAdapter.java
src/jalview/renderer/AnnotationRenderer.java
src/jalview/renderer/ContactMapRenderer.java
src/jalview/renderer/api/AnnotationRowRendererI.java
src/jalview/structure/StructureSelectionManager.java~
src/jalview/util/SparseCount.java~
src/jalview/viewmodel/AlignmentViewport.java
src/jalview/ws/dbsources/Pdb.java~