Skip to content

Commit

Permalink
Merge branch 'pr/95'
Browse files Browse the repository at this point in the history
  • Loading branch information
liabru committed May 21, 2015
2 parents 0a73a64 + 96735dd commit eed9167
Show file tree
Hide file tree
Showing 6 changed files with 27,233 additions and 14,242 deletions.
2 changes: 1 addition & 1 deletion demo/dev.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
<script type="text/javascript" src="./js/lib/decomp.js"></script>

<!-- only required if using Matter.RenderPixi -->
<script type="text/javascript" src="./js/lib/pixi.dev.js"></script>
<script type="text/javascript" src="./js/lib/pixi.js"></script>

<!-- matter lib edge master version -->
<script type="text/javascript" src="./js/lib/matter-dev.js"></script>
Expand Down
2 changes: 1 addition & 1 deletion demo/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<meta name="robots" content="noindex">

<!-- only required if using Matter.RenderPixi -->
<script type="text/javascript" src="./js/lib/pixi.dev.js"></script>
<script type="text/javascript" src="./js/lib/pixi.js"></script>

<!-- matter lib v0.8.0 -->
<script type="text/javascript" src="./js/lib/matter-0.8.0.js"></script>
Expand Down
Loading

0 comments on commit eed9167

Please sign in to comment.