Merge branch 'dev' of https://github.com/GoodBoyDigital/pixi.js into dev

Browse source

Conflicts: src/pixi/textures/RenderTexture.js
Updated example for render texture

...

This commit is contained in:

Mat Groves 2013-07-11 20:32:29 +01:00

parent 5141791ae7 40ad463d27

commit 92b513e4f0

55 changed files with 28041 additions and 12487 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

2538

examples/example 10 - Text/pixi.js

View file

File diff suppressed because it is too large Load diff