foster/liabru-matter-js
0
0
Fork 0
mirror of https://github.com/liabru/matter-js.git synced 2025-01-21 17:14:38 -05:00
Code Issues Wiki Activity

Merge branch 'master' of https://github.com/jackismissing/matter-js into jackismissing-master

Browse source 
# Conflicts:
#	src/render/RenderPixi.js
This commit is contained in:
liabru 2016-06-25 18:42:40 +01:00
commit ba1913068f
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/render/RenderPixi.js
View file

@ -11,9 +11,11 @@ var RenderPixi = {};
module.exports = RenderPixi;
var Bounds = require('../geometry/Bounds');
var Composite = require('../body/Composite');
var Common = require('../core/Common');
var Events = require('../core/Events');
var Vector = require('../geometry/Vector');
(function() {