Changeset [371973ce2f01f1071479f65151845a0a5b200e41] by Robert Buels
Revision 371973ce2f01f1071479f65151845a0a5b200e41,
committed by Robert Buels
· December 13th, 2012 @ 09:08 AM
Merge branch 'maint/1.7.x' into jbrowse_1.7
Conflicts:
release-notes.txt
src/JBrowse/Browser.js
https://github.com/GMOD/jbrowse/commit/371973ce2f01f1071479f6515184...
4 changed files
-
M
release-notes.txt -
M
src/JBrowse/Browser.js -
M
src/JBrowse/View/TrackList/Faceted.js -
M
tests/selenium_tests/jbrowse_selenium/JBrowseTest.py