Changeset [127ed2274f8966b2f785c9e667bd82af20b8b2e3] by Robert Buels
Revision 127ed2274f8966b2f785c9e667bd82af20b8b2e3,
committed by Robert Buels
· July 25th, 2013 @ 10:51 AM
Merge branch 'master' into combination_track
Conflicts:
release-notes.txt src/JBrowse/View/FeatureGlyph.js
src/JBrowse/View/Track/WiggleBase.js
https://github.com/GMOD/jbrowse/commit/127ed2274f8966b2f785c9e667bd...
51 changed files
-
A
bin/maker2jbrowse -
A
maker.css -
A
src/JBrowse/View/Track/_TrackDetailsStatsMixin.js -
A
tests/data/maker_dmel_example/dpp_contig.maker.output/dpp_contig_datastore/05/1F/contig-dpp-500-500/contig-dpp-500-500.gff -
A
tests/data/maker_dmel_example/dpp_contig.maker.output/dpp_contig_datastore/05/1F/contig-dpp-500-500/contig-dpp-500-500.maker.proteins.fasta -
A
tests/data/maker_dmel_example/dpp_contig.maker.output/dpp_contig_datastore/05/1F/contig-dpp-500-500/contig-dpp-500-500.maker.transcripts.fasta -
A
tests/data/maker_dmel_example/dpp_contig.maker.output/dpp_contig_datastore/05/1F/contig-dpp-500-500/run.log -
A
tests/data/maker_dmel_example/dpp_contig.maker.output/dpp_contig_master_datastore_index.log -
A
tests/data/volvox.sizes -
A
tests/perl_tests/maker2jbrowse.t -
M
Makefile.PL -
M
bin/flatfile-to-json.pl -
M
bin/prepare-refseqs.pl -
M
build/init.js -
M
genome.css -
M
icons.css -
M
img/commonIconsDisabled.png -
M
img/commonIconsEnabled.png -
M
main.css -
M
release-notes.txt -
M
sample_data/json/modencode/trackList.json -
M
setup.sh -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/Store/TrackMetaData.js -
M
src/JBrowse/Util.js -
M
src/JBrowse/View/DetailsMixin.js -
M
src/JBrowse/View/Export/GFF3.js -
M
src/JBrowse/View/FeatureGlyph.js -
M
src/JBrowse/View/FeatureGlyph/Box.js -
M
src/JBrowse/View/GranularRectLayout.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/BlockBased/Block.js -
M
src/JBrowse/View/Track/CanvasFeatures.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/WiggleBase.js -
M
src/JBrowse/has.js -
M
src/perl5/Bio/JBrowse/Cmd/FlatFileToJson.pm -
M
src/perl5/Bio/JBrowse/Cmd/FormatSequences.pm -
M
src/perl5/Bio/JBrowse/FeatureStream.pm -
M
src/perl5/FastaDatabase.pm -
M
src/perl5/FeatureTrack.pm -
M
tests/data/hg19_formatted/trackList.json -
M
tests/data/volvox_formatted_refseqs/trackList.json -
M
tests/perl_tests/biodb-to-json.pl.t -
M
tests/perl_tests/flatfile-to-json.pl.t -
M
tests/perl_tests/prepare-refseqs.pl.t -
M
tests/perl_tests/wig-to-json.pl.t -
M
track_styles.css