Changeset [03c5edb7e6f14a0d7106106fa3a12b5f8a63c8ba] by Robert Buels
Revision 03c5edb7e6f14a0d7106106fa3a12b5f8a63c8ba,
committed by Robert Buels
· December 6th, 2012 @ 08:32 PM
Merge branch 'maint/1.7.x' into jbrowse_1.7
Conflicts:
release-notes.txt src/JBrowse/Browser.js
src/JBrowse/ConfigAdaptor/JB_json_v1.js src/JBrowse/Store/BigWig.js
src/JBrowse/View/Track/Sequence.js
https://github.com/GMOD/jbrowse/commit/03c5edb7e6f14a0d7106106fa3a1...
10 changed files
-
M
faceted_track_selector.css -
M
main.css -
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/ConfigAdaptor/JB_json_v1.js -
M
src/JBrowse/ConfigManager.js -
M
src/JBrowse/Store/RemoteBinaryFile.js -
M
src/JBrowse/Store/SeqFeature/BigWig.js -
M
src/JBrowse/View/Ruler.js -
M
src/JBrowse/View/Track/Sequence.js