Fork: 0
mark / pixi.js
Browse code
Merge branch 'dev' into dev-es6
# Conflicts:
#	src/accessibility/AccessibilityManager.js
#	src/core/text/Text.js
batch-dev bugfix/polygon-offset dev dev-blendmode-add-again dev-canvas-renderer-dirty-transform dev-graphics-fix-batches dev-line-join dev-offscreen-canvas dev-renderTexture-pool dev-replace-buble-with-babel englercj/update-s3 feature-nine-slice-canvas-tint fix-svg master multiple-pointer-down-events upgrade v4.x v5.0.4 v5.0.3 v5.0.2 v5.0.1 v5.0.0-rc.3 v5.0.0-rc.2 v5.0.0-rc v5.0.0-alpha.3 v5.0.0-alpha.2 v5.0.0-alpha v5.0.0 v4.8.8 v4.8.7 v4.8.6 v4.8.5 v4.8.4 v4.8.3 v4.8.2 v4.8.1 v4.8.0 v4.7.3 v4.7.2 v4.7.1 v4.7.0 v4.6.2 v4.6.1 v4.6.0 v4.5.6 v4.5.5 v4.5.4 v4.5.3 v4.5.2 v4.5.1 v4.5.0 floattex
commit fdab0ea0c1b070ef90a2acf3b8b4d072521e3348
2 parents 0790471 + 8fe0ad2
@Matt Karl Matt Karl authored on 21 Sep 2016
Patch
Unified Split
Showing 2 changed files
View
src/accessibility/AccessibilityManager.js
View
src/core/text/Text.js