Merge branch 'dev'
commit b7d79cb2d6ce8edbc3677eeacd1758e2ea20457c
2 parents 304a73f + c601e02
@Mat Groves Mat Groves authored on 10 Jan 2014
Showing 3 changed files
View
src/pixi/InteractionManager.js
View
src/pixi/loaders/BitmapFontLoader.js
View
src/pixi/text/Text.js