Changeset [53bc7a8a1d411a55d49b8ed11b8cd239cdd16fa1] by Robert Buels
Revision 53bc7a8a1d411a55d49b8ed11b8cd239cdd16fa1,
committed by Robert Buels
· September 28th, 2012 @ 10:22 AM
Merge branch 'master' into data_export
Conflicts:
src/JBrowse/View/Track/HTMLFeatures.js
https://github.com/GMOD/jbrowse/commit/53bc7a8a1d411a55d49b8ed11b8c...
18 changed files
-
R
src/perl5/JsonGenerator.pm -
M
README.md -
M
bin/add-track-json.pl -
M
docs/tutorial/data_files/volvox.fa -
M
docs/tutorial/data_files/volvox.gff3 -
M
main.css -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Store/LazyTrie.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
src/JBrowse/View/Track/Wiggle.js -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
src/perl5/JsonFileStorage.pm -
M
tests/data/volvox_formatted_refseqs/seq/ctgB/0.txt -
M
tests/data/volvox_formatted_refseqs/seq/refSeqs.json -
M
tests/perl_tests/prepare-refseqs.pl.t