Lutz Hoeren 48d0a436ab Merge branch 'master' into patch-1 ...

* master: (356 commits)
  vuex-i18n: Fixes from code review (#21418)
  resourcejs: Increase TypeScript version to match mongoose
  leaflet.polylinemeasure: Add TypeScript version
  updated TS version to 2.3 for abel-webpack-plugin.
  crlf -> lf
  Make hljs a proper UMD module
  Use only major.minor for `highlight.js`.
  atom: fix several incorrect definitions.
  Update index.d.ts
  Node: `path.format` input properties are optional (#21003)
  New typings for fs-cson module (#21375)
  New typings for bunyan-format module (#21376)
  [chart.js] Add 'pie' to ChartType
  Update highlight.js version to latest (9.12.0)
  Fix type for highlight.js continuation argument
  Fixed errors after dts-gen
  New typings for module wtfnode
  fix getMeasure result fix: IGenericDimensionLayout
  change return Value of getDimension() from Dimension Object
  puppeteer: setCookie should be less strict
  ...

# Conflicts:
#	types/three/test/css3d/css3d_sprites.ts
#	types/three/test/webgl/webgl_materials.ts

2017-11-11 09:53:58 +01:00

..

test

…

detector.d.ts

…

index.d.ts

…

three-canvasrenderer.d.ts

…

three-colladaLoader.d.ts

…

three-copyshader.d.ts

…

three-core.d.ts

…

three-css3drenderer.d.ts

…

three-ctmloader.d.ts

…

three-ddsloader.d.ts

…

three-editorcontrols.d.ts

…

three-effectcomposer.d.ts

…

three-examples.d.ts

…

three-fbxloader.d.ts

…

three-FirstPersonControls.d.ts

…

three-maskpass.d.ts

…

three-mtlloader.d.ts

…

three-objloader.d.ts

…

three-octree.d.ts

…

three-orbitcontrols.d.ts

…

three-orthographictrackballcontrols.d.ts

…

three-projector.d.ts

…

three-renderpass.d.ts

…

three-shaderpass.d.ts

…

three-trackballcontrols.d.ts

…

three-transformcontrols.d.ts

…

three-vrcontrols.d.ts

…

three-vreffect.d.ts

…

tsconfig.json

…

tslint.json

…