Changeset [032124013bfc6dcb1964bf017190ae8bba7936f8] by Robert Buels
Revision 032124013bfc6dcb1964bf017190ae8bba7936f8,
committed by Robert Buels
· December 7th, 2012 @ 09:35 AM
Merge branch 'maint/1.7.x' into jbrowse_1.7
Conflicts:
src/JBrowse/Browser.js
https://github.com/GMOD/jbrowse/commit/032124013bfc6dcb1964bf017190...
4 changed files
-
M
jbrowse_conf.json -
M
src/JBrowse/Browser.js -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
src/JBrowse/ConfigManager.js