[Pkg-javascript-commits] [leaflet-markercluster] 25/219: Merge branch 'better-loading'

[Jonas Smedegaard]

This is an automated email from the git hooks/post-receive script.

js pushed a commit to branch master
in repository leaflet-markercluster.

commit fb4b6d39a6ac3cf4e181c03adacbab67fcacdabf
Merge: 04a50ab 78ccf98
Author: danzel <danzel at localhost.geek.nz>
Date:   Wed Jan 22 09:26:06 2014 +1300

    Merge branch 'better-loading'
    
    Conflicts:
    	dist/leaflet.markercluster.js

 dist/leaflet.markercluster-src.js              | 131 ++++++++++++----------
 example/marker-clustering-realworld.10000.html |   2 +-
 example/marker-clustering-realworld.50000.html |  21 +++-
 example/screen.css                             |  25 ++++-
 src/MarkerClusterGroup.js                      | 148 ++++++++++++++-----------
 5 files changed, 200 insertions(+), 127 deletions(-)


-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-javascript/leaflet-markercluster.git