[Pkg-javascript-commits] [node-mapnik] 02/08: Merge tag 'upstream/1.2.0'

[Jérémy Lal]

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

kapouer pushed a commit to branch master
in repository node-mapnik.

commit db612eb7e9f092538ad5d364fe2667a1b715c600
Merge: 215b4da ec7ec80
Author: Jérémy Lal <kapouer at melix.org>
Date:   Wed Sep 18 21:27:10 2013 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0
    
    # gpg: Signature faite le mer. 18 sept. 2013 21:27:06 CEST avec la clef RSA d'identifiant DD39F374
    # gpg: Bonne signature de « Jérémy Lal <kapouer at melix.org> »
    # gpg:                 alias « Jérémy Lal <jerry at edagames.com> »

 .travis.yml                                |   24 ++++++++++++++++
 CHANGELOG.md                               |    8 ++++++
 Makefile                                   |   10 +++----
 README.md                                  |   33 ++++++++-------------
 binding.gyp                                |   15 ++++++++--
 common.gypi                                |   10 +++++--
 package.json                               |   17 +++--------
 src/mapnik_map.cpp                         |   43 ++++++++++++++++++++++++----
 src/mapnik_vector_tile.cpp                 |   13 ++++++++-
 test/cairo_surface.test.js                 |    2 +-
 test/color.test.js                         |    2 +-
 test/compositing.test.js                   |    2 +-
 test/constants.test.js                     |    2 +-
 test/data/vector_tile/tile0-b.actual.png   |  Bin 0 -> 13035 bytes
 test/data/vector_tile/tile0-b.expected.png |  Bin 0 -> 13035 bytes
 test/data/vector_tile/tile0.expected.png   |  Bin 27053 -> 27091 bytes
 test/datasource.test.js                    |    2 +-
 test/expression.test.js                    |    2 +-
 test/feature.test.js                       |    2 +-
 test/fonts.test.js                         |    2 +-
 test/grid.test.js                          |    2 +-
 test/grid_view.test.js                     |    2 +-
 test/image.test.js                         |    2 +-
 test/image_view.test.js                    |    2 +-
 test/layers.test.js                        |    2 +-
 test/map.test.js                           |    2 +-
 test/map_generation.test.js                |    2 +-
 test/palette.test.js                       |    2 +-
 test/parameters.test.js                    |    2 +-
 test/proj_transform.test.js                |    2 +-
 test/projection.test.js                    |    2 +-
 test/query-map.test.js                     |    2 +-
 test/render-async.test.js                  |    2 +-
 test/render-sync.test.js                   |    2 +-
 test/render_grid.test.js                   |    2 +-
 test/tmp/placeholder.txt                   |    1 +
 test/unicode-loading.test.js               |    2 +-
 test/vector-tile.test.js                   |   30 ++++++++++++++++---
 38 files changed, 174 insertions(+), 78 deletions(-)

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