Changeset [b83efcb8eac50f99b0e5ba6a319d3ed0965c3c25] by Robert Buels
Revision b83efcb8eac50f99b0e5ba6a319d3ed0965c3c25,
committed by Robert Buels
· July 29th, 2013 @ 12:23 PM
Merge branch 'segments_glyph' into combination_track
Conflicts:
release-notes.txt src/JBrowse/View/FeatureGlyph.js
src/JBrowse/View/FeatureGlyph/Box.js
src/JBrowse/View/Track/WiggleBase.js
https://github.com/GMOD/jbrowse/commit/b83efcb8eac50f99b0e5ba6a319d...
10 changed files
-
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/_FeatureContextMenusMixin.js -
M
release-notes.txt -
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/CanvasFeatures.js