Merge branch 'master' into dev
commit 09b827f66ba83bd36c2107fca701a0a6a6fea7fd
2 parents 1e50c2b + 8dd5408
@mathew groves mathew groves authored on 13 Nov 2014
Showing 7 changed files
View
README.md
View
bin/pixi.dev.js
View
bin/pixi.dev.js.map
View
bin/pixi.js
View
examples/example 23 - Texture Swap/eggHead.png 0 → 100644
View
examples/example 23 - Texture Swap/flowerTop.png 0 → 100644
View
src/pixi/display/DisplayObject.js 100644 → 100755