[Pkg-javascript-commits] [modestmaps-js] 04/04: Merge tag 'upstream/3.3.6+ds1'

[Andrew Harvey]

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

andrewharvey-guest pushed a commit to branch master
in repository modestmaps-js.

commit 4495b996d04ea9e5bc6708020ab083839b002cb9
Merge: 46f358f 0741a33
Author: Andrew Harvey <andrew.harvey4 at gmail.com>
Date:   Sun Sep 29 20:47:16 2013 +1000

    Merge tag 'upstream/3.3.6+ds1'
    
    Upstream version 3.3.6+ds1
    
    # gpg: Signature made Sun 29 Sep 2013 20:47:15 EST using RSA key ID DDB7E072
    # gpg: Good signature from "Andrew Harvey <andrew.harvey4 at gmail.com>"

 .gitignore                               |    2 +
 CHANGELOG                                |   10 +
 Makefile                                 |   18 +-
 VERSION                                  |    1 +
 doc/.gitignore                           |    2 +
 doc/Makefile                             |   15 +
 doc/api.md                               | 1168 ++++++++++++++++++++++++++
 doc/css/main.css                         |  206 +++++
 doc/end.html                             |    3 +
 doc/index.html                           | 1350 ++++++++++++++++++++++++++++++
 doc/middle.html                          |    3 +
 doc/start.html                           |   12 +
 doc/toc.md                               |  108 +++
 examples/geojson/modestmaps.markers.js   |    2 +-
 examples/node/modestmaps-static.js       |   41 +-
 examples/spotlight/modestmaps.markers.js |    2 +-
 modestmaps.js                            |   13 +-
 modestmaps.min.js                        |    8 +-
 package.json                             |    2 +-
 src/layer.js                             |    2 +
 src/map.js                               |    5 +-
 src/provider.js                          |    4 +-
 src/start.js                             |    2 +-
 test/spec/Map.js                         |    7 +
 24 files changed, 2933 insertions(+), 53 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/modestmaps-js.git