Merge branch 'Dev'

Browse source

Conflicts:
	src/pixi/text/Text.js

...

This commit is contained in:

Mat Groves 2013-05-22 18:51:59 +01:00

parent df77e6dada 88b863155a

commit 6a049c788e

81 changed files with 14119 additions and 6318 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

1389

bin/pixi.dev.js

View file

File diff suppressed because it is too large Load diff