Changeset [10de90982ca03f64ec5bc1a3b80e4d37be520d18] by Gregg Helt
Revision 10de90982ca03f64ec5bc1a3b80e4d37be520d18,
committed by Gregg Helt
· February 17th, 2011 @ 10:14 AM
Merge branch 'master' of http://github.com/jbrowse/jbrowse
Pulling in changes from new JBrowse 1.2 release. Resolving
conflicts.
Conflicts:
bin/biodb-to-json.pl
js/FeatureTrack.js
https://github.com/GMOD/jbrowse/commit/10de90982ca03f64ec5bc1a3b80e...
20 changed files
-
A
bin/bam-to-json.pl -
A
bin/ucsc-to-json.pl -
A
lib/BioperlFlattener.pm -
A
lib/ExternalSorter.pm -
A
lib/LazyNCList.pm -
A
lib/NCLSorter.pm -
A
touch.html -
M
VERSION -
M
bin/biodb-to-json.pl -
M
bin/flatfile-to-json.pl -
M
bin/prepare-refseqs.pl -
M
bin/wig-to-json.pl -
M
index.html -
M
js/Browser.js -
M
js/FeatureTrack.js -
M
js/LazyArray.js -
M
lib/JsonGenerator.pm -
M
lib/NCList.pm -
M
release-notes.txt -
M
src/wig2png.cc