Changeset [e09d5f2e93d90e2dd7a9a5ca60dbfb68a0de968d] by Robert Buels
Revision e09d5f2e93d90e2dd7a9a5ca60dbfb68a0de968d,
committed by Robert Buels
· July 29th, 2013 @ 02:46 PM
Merge branch 'combination_track'
Conflicts:
src/perl5/GenomeDB.pm
https://github.com/GMOD/jbrowse/commit/e09d5f2e93d90e2dd7a9a5ca60db...
39 changed files
-
A
combination_tracks.css -
A
src/JBrowse/Model/BinaryTreeNode.js -
A
src/JBrowse/Store/SeqFeature/BAMCombination.js -
A
src/JBrowse/Store/SeqFeature/Combination.js -
A
src/JBrowse/Store/SeqFeature/CombinationBase.js -
A
src/JBrowse/Store/SeqFeature/Mask.js -
A
src/JBrowse/Store/SeqFeature/QuantitativeCombination.js -
A
src/JBrowse/View/FeatureGlyph/Gene.js -
A
src/JBrowse/View/FeatureGlyph/ProcessedTranscript.js -
A
src/JBrowse/View/FeatureGlyph/Segments.js -
A
src/JBrowse/View/Track/Combination.js -
A
src/JBrowse/View/Track/Combination/CombinationDialog.js -
A
src/JBrowse/View/Track/_FeatureContextMenusMixin.js -
M
docs/tutorial/conf_files/volvox.json -
M
genome.css -
M
main.css -
M
release-notes.txt -
M
src/FileSaver -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Store/SeqFeature/BigWig/RequestWorker.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Store/SeqFeature/SNPCoverage.js -
M
src/JBrowse/View/FeatureGlyph.js -
M
src/JBrowse/View/FeatureGlyph/Alignment.js -
M
src/JBrowse/View/FeatureGlyph/Box.js -
M
src/JBrowse/View/FeatureGlyph/_FeatureLabelMixin.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/CanvasFeatures.js -
M
src/JBrowse/View/Track/ExportMixin.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/SNPCoverage.js -
M
src/JBrowse/View/Track/Wiggle/Density.js -
M
src/JBrowse/View/Track/Wiggle/XYPlot.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/JBrowse/has.js -
M
src/perl5/Bio/JBrowse/Cmd/FlatFileToJson.pm -
M
src/perl5/GenomeDB.pm -
M
track_styles.css