Merge pull request #336 from gberaudo/port_ol3_cesium

Port to latest stable OL3 and Cesium versions
openlayers · Apr 4, 2016 · 1c1c484 · 1c1c484
2 parents 6ed7dc0 + cfc7187
commit 1c1c484
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 2 deletions.
diff --git a/CHANGES.md b/CHANGES.md
@@ -6,6 +6,8 @@
   * Use fast pixelated canvas scaling on supported browsers. See
     PR 3288 / commit 322df7b in Cesium. On unsupported browsers, render at
     full resolution (slow).
+  * Port to OL 3.15.0.
+  * Port to Cesium 1.20.
 
 ## v 1.14 - 2016-03-31
 

diff --git a/build/ol3cesium.json b/build/ol3cesium.json
@@ -10,6 +10,7 @@
       "externs/olcsx.js",
       "ol3/externs/oli.js",
       "ol3/externs/olx.js",
+      "ol3/externs/cartodb.js",
       "ol3/externs/proj4js.js",
       "ol3/externs/tilejson.js",
       "ol3/externs/topojson.js",

diff --git a/cesium b/cesium
diff --git a/ol3 b/ol3