 Tom Payne
|
7ce7bb2187
|
Merge remote-tracking branch 'openlayers/master' into vector-api
|
2014-01-09 11:42:14 +01:00 |
|
|
Tom Payne
|
b59eec7a83
|
Merge remote-tracking branch 'openlayers/master' into vector-api
|
2013-12-13 20:22:06 +01:00 |
|
 Éric Lemoine
|
35d5158454
|
Merge remote-tracking branch 'upstream/master' into vector-api
Conflicts:
src/objectliterals.jsdoc
src/ol/attribution.js
src/ol/geom/geometry.js
src/ol/geom/geometrycollection.js
src/ol/geom/linestring.js
src/ol/layer/vectorlayer.exports
src/ol/layer/vectorlayer.js
src/ol/map.js
src/ol/proj/proj.js
src/ol/renderer/canvas/canvasvectorlayerrenderer.js
src/ol/source/imagewmssource.js
src/ol/source/tilewmssource.js
src/ol/source/vectorsource.exports
src/ol/source/vectorsource.js
src/ol/source/wmssource.js
src/ol/style/style.js
src/ol/tilegrid/tilegrid.js
src/ol/tilegrid/wmtstilegrid.js
src/ol/tilegrid/xyztilegrid.js
|
2013-12-13 12:53:57 +01:00 |
|
 oterral
|
bd560bfb0f
|
Add WMS GetCapabilties parser
|
2013-12-05 16:57:33 +01:00 |
|
|
Tom Payne
|
1dd5f7f7c8
|
Merge remote-tracking branch 'openlayers/master' into vector-api
|
2013-12-05 16:53:04 +01:00 |
|
|
Tom Payne
|
d2fd695635
|
Merge branch 'master' into vector-api
|
2013-11-28 21:00:18 +01:00 |
|
|
Tom Payne
|
424f8fcc6d
|
Merge remote-tracking branch 'openlayers/master' into vector-api
|
2013-11-27 13:10:20 +01:00 |
|
|
Éric Lemoine
|
82e03ea508
|
Add an icon example
|
2013-11-26 16:32:03 +01:00 |
|
|
Tom Payne
|
ba42abac68
|
Move wkt example out of the way
|
2013-11-20 11:44:46 +01:00 |
|
|
Tom Payne
|
07ef8e774d
|
Move parser examples away
|
2013-11-20 11:41:07 +01:00 |
|
|
Tom Payne
|
4e65fefc00
|
Move vector code out of the way
|
2013-11-20 11:39:21 +01:00 |
|