Merge pull request #293 from gberaudo/release_v1.10

gberaudo · gberaudo · commit 10c5fcf1565f · 2015-11-30T11:55:22.000+01:00
Prepare for release v1.10
diff --git a/CHANGES.md b/CHANGES.md
@@ -1,6 +1,6 @@
 # Changelog
 
-## v1.10
+## v1.10 - 2015-11-30
 
 * Breaking changes
   * OL3-Cesium is now compiled together with OL3. A custom closure compiler
diff --git a/Makefile b/Makefile
@@ -90,8 +90,10 @@ cleanall: clean
 	mkdir -p $(dir $@)
 	cp -R cesium/Build/Cesium dist/
 	cp -R examples dist/
+	cp ol3/css/ol.css dist/
 	for f in dist/examples/*.html; do $(SEDI) 'sY/@loaderY../ol3cesium.jsY' $$f; done
 	for f in dist/examples/*.html; do $(SEDI) 'sY../cesium/Build/Y../Y' $$f; done
+	for f in dist/examples/*.html; do $(SEDI) 'sY../ol3/css/ol.cssY../ol.cssY' $$f; done
 	for f in dist/examples/*.js; do $(SEDI) 'sY../cesium/Build/Y../Y' $$f; done
 	touch $@
 
diff --git a/cesium b/cesium
@@ -1 +1 @@
-Subproject commit 33529f4191d1d50a7f318b118d6fb83b7c691910
+Subproject commit 75c1e8b6bdfc469ae43a9a19bde16e2c883496a0
diff --git a/ol3 b/ol3
@@ -1 +1 @@
-Subproject commit db0c8c3c3a3083525fd8e82d9e2755ad38d81bf0
+Subproject commit eb5607544c71f9445dcb3bcac27d0db62cff18d0
