Changeset [e54445b15931e8e9b84c5f8f9e93c53d53a38f98] by Robert Buels
Revision e54445b15931e8e9b84c5f8f9e93c53d53a38f98,
committed by Robert Buels
· January 22nd, 2013 @ 11:18 AM
Merge branch 'movearound140', closes #140
Conflicts:
.gitignore src/JBrowse/ConfigAdaptor/JB_json_v1.js
tests/js_tests/index.html
https://github.com/GMOD/jbrowse/commit/e54445b15931e8e9b84c5f8f9e93...
7 changed files
-
A
src/JBrowse/ConfigAdaptor/AdaptorUtil.js -
A
src/JBrowse/ConfigAdaptor/conf.js -
A
tests/js_tests/spec/GBrowseParseTestBasic.conf -
A
tests/js_tests/spec/GBrowseParser.spec.js -
M
.gitignore -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
tests/js_tests/index.html