Merge branch 'v1.1'

aaronpowell · Jun 29, 2018 · 311a5af · 311a5af
2 parents f9bdaee + b905f5f
commit 311a5af
Show file tree

Hide file tree

Showing 90 changed files with 11,271 additions and 482 deletions.
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/Example.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/Example.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/Logo.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/Logo.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m1.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m1.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m2.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m2.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m3.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m3.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m4.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m4.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m5.png b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Images/m5.png
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Lang/en-us.xml b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Lang/en-us.xml
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/Terratype.GoogleMapsV3.Renderer.js b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/Terratype.GoogleMapsV3.Renderer.js
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/Terratype.GoogleMapsV3.js b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/Terratype.GoogleMapsV3.js
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/markerclusterer.js b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/markerclusterer.js
diff --git a/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/markerclusterer.min.js b/Chauffeur.Demo/App_Plugins/Terratype.GoogleMapsV3/Scripts/markerclusterer.min.js