Changeset [1f93859f5b483e1a564c7546991014fdd11f2e0a] by Robert Buels
Revision 1f93859f5b483e1a564c7546991014fdd11f2e0a,
committed by Robert Buels
· July 12th, 2012 @ 10:34 AM
Merge branch 'master' into amd_bigwig
Conflicts:
dist.ini
https://github.com/GMOD/jbrowse/commit/1f93859f5b483e1a564c75469910...
7 changed files
-
A
docs/screencasts/demo_script.txt -
M
bin/bam-to-json.pl -
M
docs/tutorial/index.html -
M
jbrowse_conf.json -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/View/TrackList/Faceted.js