Merge branch 'master' into rename-repo-url

This commit is contained in:
vvakame
2016-03-17 21:06:54 +09:00
1140 changed files with 179704 additions and 179635 deletions
+1 -1
View File
@@ -6,7 +6,7 @@
/// <reference path="../threejs/three.d.ts" />
declare module Physijs {
declare namespace Physijs {
export function noConflict():Object;
export function createMaterial(material: THREE.Material, friction?: number, restitution?: number): Material;