Changeset [1c95bc3f1a877db764fff9e7a7e63b5a40d03f9b] by Daniel Kasenberg

July 2nd, 2013 @ 08:11 AM

Merge branch 'combination_track' of https://github.com/GMOD/jbrowse into combination_2

Conflicts:
src/JBrowse/View/Track/ExportMixin.js https://github.com/GMOD/jbrowse/commit/1c95bc3f1a877db764fff9e7a7e6...

Committed by Daniel Kasenberg

  • M src/JBrowse/Browser.js
  • M src/JBrowse/GenomeView.js
  • M src/JBrowse/View/Track/Alignments.js
  • M src/JBrowse/View/Track/Alignments2.js
  • M src/JBrowse/View/Track/BlockBased.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/SNPCoverage.js
  • M src/JBrowse/View/Track/Sequence.js
  • M src/JBrowse/View/Track/VariantDetailMixin.js
New-ticket 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