Changeset [52d651d1fe8e226a712b3fe12563f836fc9397fb] by Robert Buels
Revision 52d651d1fe8e226a712b3fe12563f836fc9397fb,
committed by Robert Buels
· August 15th, 2013 @ 08:41 AM
Merge branch 'master' into arrowheads_2
Conflicts:
src/JBrowse/View/Track/CanvasFeatures.js
https://github.com/GMOD/jbrowse/commit/52d651d1fe8e226a712b3fe12563...
12 changed files
-
A
src/JBrowse/Util/RejectableFastPromise.js -
M
.gitignore -
M
index.html -
M
release-notes.txt -
M
src/JBrowse/Store/SeqFeature/BigWig/RequestWorker.js -
M
src/JBrowse/Store/SeqFeature/GFF3.js -
M
src/JBrowse/Util/GFF3.js -
M
src/JBrowse/View/DetailsMixin.js -
M
src/JBrowse/View/FeatureGlyph/Alignment.js -
M
src/JBrowse/View/FeatureGlyph/Box.js -
M
src/JBrowse/View/FileDialog/TrackList.js -
M
src/JBrowse/View/Track/CanvasFeatures.js