fix some merge issues
1 parent d8c74e7 commit de8c6bfe0ad00acdba43f49c9e2e6b0b978d35c5
@Chad Engler Chad Engler authored on 8 Aug 2014
Showing 2 changed files
View
src/pixi/loaders/ImageLoader.js
View
src/pixi/textures/RenderTexture.js