Changeset [1c7f0b3b273daa788fbcf8ae1fbd55bf95028340] by Robert Buels
Revision 1c7f0b3b273daa788fbcf8ae1fbd55bf95028340,
committed by Robert Buels
· September 6th, 2012 @ 02:28 AM
Merge branch 'master' into triplestore
Conflicts:
src/JBrowse/View/Track/HTMLFeatures.js
https://github.com/GMOD/jbrowse/commit/1c7f0b3b273daa788fbcf8ae1fbd...
3 changed files
-
M
bin/add-track-json.pl -
M
release-notes.txt -
M
src/JBrowse/View/Track/HTMLFeatures.js