Changeset [23fda9b68719b47767a88028e4c2d152e1b24f1d] by Robert Buels
Revision 23fda9b68719b47767a88028e4c2d152e1b24f1d,
committed by Robert Buels
· May 31st, 2013 @ 09:15 AM
Merge branch 'master' into multiview
Conflicts:
src/JBrowse/GenomeView.js
https://github.com/GMOD/jbrowse/commit/23fda9b68719b47767a88028e4c2...
7 changed files
-
M
main.css -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/GenomeView.js -
M
src/JBrowse/View/Track/BlockBased.js -
M
src/JBrowse/View/Track/WiggleBase.js -
M
src/perl5/JBlibs.pm