Changeset [fa14cb9fbb35b7dc1683b54d274e48b1739f2dd4] by Ed Lee
Revision fa14cb9fbb35b7dc1683b54d274e48b1739f2dd4,
committed by Ed Lee
· December 10th, 2012 @ 11:39 AM
Merge branch 'jbrowse_1.7' of github.com:berkeleybop/jbrowse
into jbrowse_1.7
https://github.com/GMOD/jbrowse/commit/fa14cb9fbb35b7dc1683b54d274e...
9 changed files
-
M
client/apollo/css/genome.css -
M
client/apollo/css/webapollo_track_styles.css -
M
client/apollo/js/FeatureEdgeMatchManager.js -
M
client/apollo/js/GFF3toJbrowseJson.js -
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/View/Track/SequenceTrack.js -
M
client/apollo/js/main.js