Changeset [ce44f513f6796ea7130d1256f6e1eee7dbee1d90] by Robert Buels
Revision ce44f513f6796ea7130d1256f6e1eee7dbee1d90,
committed by Robert Buels
· July 29th, 2013 @ 12:16 PM
Merge branch 'master' into combination_track
Conflicts:
src/JBrowse/View/Track/WiggleBase.js
https://github.com/GMOD/jbrowse/commit/ce44f513f6796ea7130d1256f6e1...
13 changed files
-
A
src/JBrowse/View/_FeatureDescriptionMixin.js -
M
release-notes.txt -
M
src/JBrowse/Store/NCList.js -
M
src/JBrowse/View/Export/GFF3.js -
M
src/JBrowse/View/FeatureGlyph/Alignment.js -
M
src/JBrowse/View/FeatureGlyph/Box.js -
M
src/JBrowse/View/Track/BlockBased/Block.js -
M
src/JBrowse/View/Track/CanvasFeatures.js -
M
src/JBrowse/View/Track/ExportMixin.js -
M
src/JBrowse/View/Track/FeatureDetailMixin.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
track_styles.css