]> source.dussan.org Git - svg.js.git/commit
projects / svg.js.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 60d3ad0 04e21b1)
Merge branch 'master' into 3.0.0
authorUlrich-Matthias Schäfer <ulima.ums@googlemail.com>
Sat, 22 Apr 2017 18:31:58 +0000 (20:31 +0200)
committerUlrich-Matthias Schäfer <ulima.ums@googlemail.com>
Sat, 22 Apr 2017 18:31:58 +0000 (20:31 +0200)
commit408940add58e81e7879098682e94504a8cf3a734
treeb7d1a4c2bc659bdafe50097c6a0e9921cbbf9ee1tree | snapshot
parent60d3ad099f3ee1a39b401d12405dba9e4d7e5da2commit | diff
parent04e21b18c30d546ed6a16b279504a2b58b503541commit | diff
Merge branch 'master' into 3.0.0

# Conflicts - all resolved:
# dist/svg.js
# dist/svg.min.js
# package.json
# spec/SpecRunner.html
# spec/spec/boxes.js
# spec/spec/element.js
# spec/spec/image.js
# spec/spec/svg.js
# src/boxes.js
# src/flatten.js
# src/image.js
# src/polyfill.js
# src/style.js
# src/svg.js
16 files changed:
CHANGELOG.md diff1 | diff2 | blob | history
bench/runner.html diff1 | diff2 | blob | history
dist/svg.js diff1 | diff2 | blob | history
dist/svg.min.js diff1 | diff2 | blob | history
package.json diff1 | diff2 | blob | history
spec/SpecRunner.html diff1 | diff2 | blob | history
spec/spec/boxes.js diff1 | diff2 | blob | history
spec/spec/container.js diff1 | diff2 | blob | history
spec/spec/element.js diff1 | diff2 | blob | history
spec/spec/image.js diff1 | diff2 | blob | history
spec/spec/path.js diff1 | diff2 | blob | history
spec/spec/svg.js diff1 | diff2 | blob | history
spec/spec/text.js diff1 | diff2 | blob | history
src/boxes.js diff1 | diff2 | blob | history
src/fx.js diff1 | diff2 | blob | history
src/svg.js diff1 | diff2 | blob | history
The lightweight library for manipulating and animating SVG: https://github.com/svgdotjs/svg.js