Changeset [53fbb5d5f62e5702d2420cd7b0508a1fb395000a] by Robert Buels
Revision 53fbb5d5f62e5702d2420cd7b0508a1fb395000a,
committed by Robert Buels
· July 9th, 2013 @ 09:25 AM
Merge branch 'maint/1.9.x'
Conflicts:
release-notes.txt
https://github.com/GMOD/jbrowse/commit/53fbb5d5f62e5702d2420cd7b050...
26 changed files
-
A
docs/tutorial/data_files/volvox_fromconfig.conf -
A
export_dialog.css -
A
src/FileSaver -
A
src/JBrowse/Store/SeqFeature/FromConfig.js -
M
.gitmodules -
M
genome.css -
M
index.html -
M
main.css -
M
release-notes.txt -
M
setup.sh -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Store/SeqFeature/REST.js -
M
src/JBrowse/View/Dialog/SetHighlight.js -
M
src/JBrowse/View/Ruler.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/ExportMixin.js -
M
src/JBrowse/View/Track/FeatureDetailMixin.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/Sequence.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/JBrowse/View/Track/YScaleMixin.js -
M
src/JBrowse/has.js -
M
tests/js_tests/index.html -
M
tests/js_tests/spec/GFF3.spec.js -
M
tests/js_tests/spec/RESTStore.spec.js