Changeset [87767784b01c12d59d4b4de4b81b8ba2398a53c1] by GREGG HELT

November 14th, 2012 @ 09:25 PM

Merge branch 'jbrowse_1.7' of github.com:berkeleybop/jbrowse into jbrowse_1.7

Conflicts:
plugins/WebApollo/js/View/Track/AnnotTrack.js https://github.com/GMOD/jbrowse/commit/87767784b01c12d59d4b4de4b81b...

Committed by GREGG HELT

  • M client/apollo/css/genome.css
  • M client/apollo/js/JSONUtils.js
  • M client/apollo/js/View/Track/AnnotTrack.js
  • M client/apollo/js/View/Track/DraggableHTMLFeatures.js
  • M client/apollo/js/main.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