Commit e343f26

committed

Merge branch 'master' of https://github.com/SuperMap/iClient-JavaScript

# Conflicts: # src/openlayers/mapping/WebMap.js

2 parents 9ebba66 + 8dd522f commit e343f26Copy full SHA for e343f26

4 files changed

+81

-59

lines changed

build/jsdocs
- openlayers
  - categories.json
- template
  - config.json
examples/leaflet
- config.js
src/openlayers/mapping
- WebMap.js

4 files changed

+81

-59

lines changed

Comments

(0)