Changeset [393ccd03cafa460728baa03017725ffb65d65f65] by Robert Buels
Revision 393ccd03cafa460728baa03017725ffb65d65f65,
committed by Robert Buels
· January 21st, 2013 @ 11:53 AM
Merge branch 'movearound140' of github.com:GMOD/jbrowse into movearound140
Conflicts:
src/JBrowse/ConfigAdaptor/gbrowse.js
https://github.com/GMOD/jbrowse/commit/393ccd03cafa460728baa0301772...
3 changed files
-
M
src/JBrowse/ConfigAdaptor/gbrowse.js -
M
tests/js_tests/spec/GBrowseParseTestBasic.conf -
M
tests/js_tests/spec/GBrowseParser.spec.js