Changeset [d7f6cb37847c4769d6eec08b58993c20ac4e215a] by Daniel Kasenberg
Revision d7f6cb37847c4769d6eec08b58993c20ac4e215a,
committed by Daniel Kasenberg
· July 18th, 2013 @ 02:53 PM
Merge branch 'combination_track' of https://github.com/GMOD/jbrowse into combination_track
Conflicts:
src/JBrowse/Store/SeqFeature/BigWig/RequestWorker.js
https://github.com/GMOD/jbrowse/commit/d7f6cb37847c4769d6eec08b5899...
3 changed files
-
M
src/JBrowse/Store/SeqFeature/BAMCombination.j -
M
src/JBrowse/Store/SeqFeature/BigWig/RequestWo -
M
src/JBrowse/View/Track/HTMLFeatures.js