Merge branch 'dev'
commit 39161a2ce470277815cfd3459117a72f85ac03e4
2 parents adb403f + 3d93fa8
@Mat Groves Mat Groves authored on 15 Jan 2014
Showing 14 changed files
View
.travis.yml
View
Gruntfile.js
View
bin/pixi.dev.js
View
bin/pixi.js
View
package.json
View
src/pixi/display/DisplayObject.js
View
src/pixi/display/DisplayObjectContainer.js
View
src/pixi/display/Stage.js
View
src/pixi/primitives/Graphics.js
View
src/pixi/renderers/canvas/CanvasRenderer.js
View
src/pixi/renderers/canvas/utils/CanvasTinter.js
View
src/pixi/textures/RenderTexture.js
View
tasks/karma.js
View
test/karma.conf.js