Merge branch 'master' into merge-test

* master: Issue 278 : Added check for existence of trim(). If trim() doesn't exist, add it to String. Hack for IE support. MarkerClustererPlus 2.1.1: Fix for Issue 266 + Cleaned up label styling code. MarkerClustererPlus 2.1: Re-incorporate old bug fix. MarkerClustererPlus 2.1: Allow for greater precision for placing text labels and icons plus allow use of Retina icons. Conflicts: src/markerclusterer.js
mahnunchik · Feb 7, 2014 · 4568948 · 4568948
2 parents 9124d49 + f01a774
commit 4568948
Show file tree

Hide file tree

Showing 5 changed files with 228 additions and 202 deletions.
diff --git a/docs/examples.html b/docs/examples.html
@@ -66,13 +66,13 @@ <h1>MarkerClustererPlus Examples</h1>
 var map = new google.maps.Map(document.getElementById("map"), options);
 
 var mcOptions = {gridSize: 50, maxZoom: 15};
-var markers = [...]; // Create the markers you want to add and collect them into a array.
+var markers = [...]; // Create the markers you want to add and collect them into an array.
 var mc = new MarkerClusterer(map, markers, mcOptions);
 </pre>
 
     <h2><a name="Marker_Clusterer" id="Marker_Clusterer"></a>Simple Example</h2>
 
-    <p>This example will show 100 markers on map.</p>
+    <p>This example will show 100 markers on a map.</p>
 
 <pre class="prettyprint">
 var center = new google.maps.LatLng(37.4419, -122.1419);