Changeset [e476c42000115bf1e2d8de2c2802e71c6a1e5e4a] by Robert Buels
Revision e476c42000115bf1e2d8de2c2802e71c6a1e5e4a,
committed by Robert Buels
· August 13th, 2013 @ 07:07 AM
Merge branch 'master' into nextgenconfig
Conflicts:
.gitignore src/JBrowse/View/Track/CanvasFeatures.js
https://github.com/GMOD/jbrowse/commit/e476c42000115bf1e2d8de2c2802...
5 changed files
-
A
src/JBrowse/Util/RejectableFastPromise.js -
M
.gitignore -
M
release-notes.txt -
M
src/JBrowse/Store/SeqFeature/BigWig/RequestWorker.js -
M
src/JBrowse/View/Track/CanvasFeatures.js