Changeset [7085e6f5d52eab2ff8a5a7b45240a1c348b7d55d] by Robert Buels
Revision 7085e6f5d52eab2ff8a5a7b45240a1c348b7d55d,
committed by Robert Buels
· January 24th, 2013 @ 10:35 AM
Merge branch 'master' into dojo_18
Conflicts:
track_styles.css
https://github.com/GMOD/jbrowse/commit/7085e6f5d52eab2ff8a5a7b45240...
2 changed files
-
M
src/JBrowse/Store/TiledImage/Fixed.js -
M
src/JBrowse/View/Track/FixedImage.js