Changeset [87767784b01c12d59d4b4de4b81b8ba2398a53c1] by GREGG HELT
Revision 87767784b01c12d59d4b4de4b81b8ba2398a53c1,
committed 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...
5 changed files
-
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