Changeset [16e6c79b0bf9d63e81a236fe2dabe29f2e7500e9] by Robert Buels
Revision 16e6c79b0bf9d63e81a236fe2dabe29f2e7500e9,
committed by Robert Buels
· July 2nd, 2013 @ 06:05 AM
Merge branch 'master' into multiview
Conflicts:
src/JBrowse/Store/SeqFeature/NCList.js
https://github.com/GMOD/jbrowse/commit/16e6c79b0bf9d63e81a236fe2dab...
7 changed files
-
M
release-notes.txt -
M
src/JBrowse/Store/SeqFeature/GFF3.js -
M
src/JBrowse/Store/SeqFeature/NCList.js -
M
src/JBrowse/Util/GFF3.js -
M
src/JBrowse/View/Track/HTMLFeatures.js -
M
tests/selenium_tests/jbrowse_selenium/JBrowseTest.py -
M
tests/selenium_tests/jbrowse_selenium/track_selectors.py