Changeset [6f4173fb49caa6a55169ae4cf1bb2defa5fe3a70] by enuggetry
Revision 6f4173fb49caa6a55169ae4cf1bb2defa5fe3a70,
committed by enuggetry
· February 28th, 2018 @ 02:54 AM
Merge origin/fix_neatcf into fix_neatcf
Conflicts:
plugins/NeatCanvasFeatures/js/main.js
https://github.com/GMOD/jbrowse/commit/6f4173fb49caa6a55169ae4cf1bb...
11 changed files
-
R
plugins/NeatCanvasFeatures/img/example.png -
R
plugins/NeatHTMLFeatures/img/example.png -
M
build/Makefile -
M
build/format_release_notes.pl -
M
plugins/CategoryUrl/README.md -
M
plugins/NeatCanvasFeatures/README.md -
M
plugins/NeatCanvasFeatures/js/main.js -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/View/Export/GFF3.js