Merge branch 'dev' of https://github.com/DarkDev-/pixi.js into dev
Conflicts:
	src/pixi/extras/TilingSprite.js
commit 06e1032c2a9eb78157c4c44ded7e0b021511def8
2 parents b486c83 + 33cf8bc
@Johan Rosén Johan Rosén authored on 16 Feb 2015
Showing 0 changed files