Changeset [fd62fc9cb97a1a28f549b5b437c7fdf11e2bce15] by GREGG HELT
December 3rd, 2012 @ 03:13 AM
Merge branch 'jbrowse_1.7' of github.com:berkeleybop/jbrowse into jbrowse_1.7
Conflicts:
src/JBrowse/View/Track/HTMLFeatures.js
https://github.com/GMOD/jbrowse/commit/fd62fc9cb97a1a28f549b5b437c7...
Committed by GREGG HELT
- A file_dialog.css
- A src/JBrowse/Store/SeqFeature/GFF3.js
- A src/JBrowse/View/ConfirmDialog.js
- A src/JBrowse/View/FileDialog.js
- A src/JBrowse/View/FileDialog/ResourceList.js
- A src/JBrowse/View/FileDialog/TrackList.js
- A src/JBrowse/View/FileDialog/TrackList/BAMDriver.js
- A src/JBrowse/View/FileDialog/TrackList/BigWigDriver.js
- A src/JBrowse/View/FileDialog/TrackList/GFF3Driver.js
- A src/JBrowse/View/TrackConfigEditor.js
- A tests/js_tests/spec/AddFiles.spec.js
- A tests/js_tests/spec/Util.spec.js
- M genome.css
- M icons.css
- M img/commonIconsEnabled.png
- M main.css
- M release-notes.txt
- M src/JBrowse/Browser.js
- M src/JBrowse/GenomeView.js
- M src/JBrowse/Model/FileBlob.js
- M src/JBrowse/Store/SeqFeature/BAM.js
- M src/JBrowse/Store/TrackMetaData.js
- M src/JBrowse/Util.js
- M src/JBrowse/View/Track/BlockBased.js
- M src/JBrowse/View/Track/FeatureCoverage.js
- M src/JBrowse/View/Track/HTMLFeatures.js
- M src/JBrowse/View/TrackList/Faceted.js
- M src/JBrowse/View/TrackList/Simple.js
- M tests/js_tests/index.html
Create new ticket
Create your profile
Help contribute to this project by taking a few moments to create your personal profile. Create your profile ยป
AJAX Genome Browser