ahocevar 66b790294d Merge branch 'master' of github.com:openlayers/ol3 into wms-improvements ...

Conflicts:
	src/ol/source/tiledwmssource.js
	test/spec/ol/tileurlfunction.test.js

2013-03-05 00:55:52 +01:00

..

tilesource.test.js

Merge branch 'master' of github.com:openlayers/ol3 into wms-improvements

2013-03-05 00:55:52 +01:00

xyz.test.js

Merge branch 'master' of github.com:openlayers/ol3 into wms-improvements

2013-03-05 00:55:52 +01:00