Changeset [f030f09ec564c50a146615a810b428c2ca096ca7] by GREGG HELT
Revision f030f09ec564c50a146615a810b428c2ca096ca7,
committed by GREGG HELT
· November 15th, 2012 @ 12:07 AM
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/f030f09ec564c50a146615a810b4...
5 changed files
-
M
client/apollo/js/BioFeatureUtils.js -
M
client/apollo/js/FeatureEdgeMatchManager.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