From bcac361365391236c05dcb2be237bb9a17fd0530 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 1 Sep 2016 17:25:42 +0200 Subject: [PATCH 1/3] Port to Cesium 1.25 --- CHANGES.md | 3 ++- cesium | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 5bc82635b..0529cda21 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -3,7 +3,8 @@ * v 1.20 * Changes - * Port to OpenLayers 3.18.1 + * Port to Cesium 1.25. + * Port to OpenLayers 3.18.1. # v 1.19 - 2016-08-08 diff --git a/cesium b/cesium index 9b20bee2c..94fd66ff4 160000 --- a/cesium +++ b/cesium @@ -1 +1 @@ -Subproject commit 9b20bee2c9cf1f85adb88f6e04597cf147ea628f +Subproject commit 94fd66ff4a25bef0d7f52a776e9cdd7bf0d996ee From 0d6831b4f635207ec7d0a6bab2f0fb4dfe2d6193 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 1 Sep 2016 22:56:06 +0200 Subject: [PATCH 2/3] Update OL3 --- CHANGES.md | 2 +- ol3 | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0529cda21..ff04ab22a 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,7 +4,7 @@ * Changes * Port to Cesium 1.25. - * Port to OpenLayers 3.18.1. + * Port to OpenLayers 3.18.2. # v 1.19 - 2016-08-08 diff --git a/ol3 b/ol3 index 0b3eed550..394c338ff 160000 --- a/ol3 +++ b/ol3 @@ -1 +1 @@ -Subproject commit 0b3eed5500216b3243077d128dd818e4b09a192c +Subproject commit 394c338ff882a940e598dc7ce05c308ca56ecf61 From 65b808f763c191dd82275c61833f17f05b475340 Mon Sep 17 00:00:00 2001 From: Guillaume Beraudo Date: Thu, 1 Sep 2016 23:10:50 +0200 Subject: [PATCH 3/3] Update changelog for release --- CHANGES.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index ff04ab22a..ad534d00f 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,6 +1,6 @@ # Changelog -* v 1.20 +* v 1.20 - 2016-09-02 * Changes * Port to Cesium 1.25. diff --git a/package.json b/package.json index 1e159ccd7..b9bf134a0 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ol3-cesium", - "version": "1.19.0", + "version": "1.20.0", "description": "OpenLayers 3 Cesium integration library", "scripts": {}, "repository": {