Éric Lemoine 87bb1b956b Merge remote-tracking branch 'upstream/master' into webgl-point ...

Conflicts:
	src/ol/style/circlestyle.js
	src/ol/style/regularshapestyle.js
	test/spec/ol/style/regularshapestyle.test.js

2014-12-04 12:57:46 +01:00

..

ol

Merge remote-tracking branch 'upstream/master' into webgl-point

2014-12-04 12:57:46 +01:00