Tim Schaub 176f18c937 Merge branch 'master' of github.com:openlayers/ol3 into vector ...

Resolved conflicts:
  src/ol/renderer/canvas/canvasrenderer.js

2013-02-20 00:38:07 -07:00

..

ogc

Add WMTS GetCapabilities parser

2013-02-19 16:32:56 +01:00

geojson.test.js

Moving GeoJSON into parser package

2013-02-20 00:09:38 -07:00