Changeset [8167994da998d9f17f8b0dda054d89595be53337] by Robert Buels
Revision 8167994da998d9f17f8b0dda054d89595be53337,
committed by Robert Buels
· February 11th, 2014 @ 12:22 PM
Merge branch '2.x' into reference_panes
Conflicts:
src/JBrowse/View/FeatureGlyph/Gene.js
src/JBrowse/View/RegionBrowser2.js
https://github.com/GMOD/jbrowse/commit/8167994da998d9f17f8b0dda054d...
7 changed files
-
M
newvolvox/trackList.json -
M
src/JBrowse/View/FeatureGlyph.js -
M
src/JBrowse/View/FeatureGlyph/Gene.js -
M
src/JBrowse/View/FeatureGlyph/ProcessedTranscript.js -
M
src/JBrowse/View/FeatureGlyph/Segments.js -
M
src/JBrowse/View/RegionBrowser2.js -
M
src/JBrowse/View/TrackRenderer/Glyphs.js