[Pkg-javascript-commits] [node-mapnik] 02/06: Merge tag 'upstream/1.2.3'

[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 3698a7e17a38fdcef719b005310ef0462f3612a1
Merge: 0be9148 7fdfb53
Author: Jérémy Lal <kapouer at melix.org>
Date:   Sun Feb 9 19:49:58 2014 +0100

    Merge tag 'upstream/1.2.3'
    
    Upstream version 1.2.3
    
    # gpg: Signature faite le dim. 09 févr. 2014 19:49:53 CET 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> »

 .gitignore                                     |      5 +
 .travis.yml                                    |     21 +-
 CHANGELOG.md                                   |     34 +-
 Makefile                                       |      2 +-
 README.md                                      |      5 +-
 binding.gyp                                    |     34 +-
 configure                                      |      3 +-
 package.json                                   |      8 +-
 src/ds_emitter.hpp                             |     67 +-
 src/mapnik_datasource.cpp                      |      1 +
 src/mapnik_feature.cpp                         |     56 +-
 src/mapnik_feature.hpp                         |      2 +
 src/mapnik_image.cpp                           |    121 +-
 src/mapnik_image.hpp                           |      3 +
 src/mapnik_image_view.cpp                      |      7 +-
 src/mapnik_vector_tile.cpp                     |    223 +-
 src/mapnik_vector_tile.hpp                     |      1 +
 src/node_mapnik.cpp                            |     84 +-
 test/compositing.test.js                       |      4 +-
 test/data/vector_tile/6.20.34.pbf              |    Bin 0 -> 2009 bytes
 test/data/vector_tile/tile0-c.expected.png     |    Bin 0 -> 14137 bytes
 test/data/vector_tile/tile0.expected.grid.json |    200 +-
 test/data/world_merc.converted.geojson         | 119953 ++++++++++++++++++++++
 test/datasource.test.js                        |     13 +-
 test/feature.test.js                           |     76 +-
 test/image.test.js                             |     31 +-
 test/image_view.test.js                        |     18 +
 test/markers.xml                               |     27 +
 test/shp2geojson.test.js                       |     29 +
 test/support/helper.js                         |      2 +-
 test/unicode-loading.test.js                   |     10 +-
 test/vector-tile.test.js                       |    304 +-
 vcbuild-old.bat                                |     16 -
 vcbuild.bat                                    |      4 +-
 wscript                                        |    209 -
 35 files changed, 121092 insertions(+), 481 deletions(-)

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