[DebianGIS-dev] [SCM] mapnik branch, master, created. e694a971ae3b44ef4f533fdb11a97c7ae3b02264

[David Paleino]

The branch, master has been created
        at  e694a971ae3b44ef4f533fdb11a97c7ae3b02264 (commit)

- Shortlog ------------------------------------------------------------
commit e694a971ae3b44ef4f533fdb11a97c7ae3b02264
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:48:55 2009 +0100

    Importing debian 0.6.1-2 from old repository

commit 8f18a6d79fd351c5facfec8ae05869a20d7d355a
Merge: d633391e4b821f11f95a6e29e2d69c8ca46a432c 9f1e8a7684d92259ce1c444f45383f2687a4ce62
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:47:27 2009 +0100

    Merge branch 'upstream'
    
    Conflicts:
    	SConstruct
    	bindings/python/SConscript
    	demo/c++/readme.txt
    	demo/c++/rundemo.cpp
    	plugins/input/gdal/SConscript
    	plugins/input/postgis/SConscript
    	plugins/input/raster/SConscript
    	plugins/input/shape/SConscript
    	src/SConscript

commit 9f1e8a7684d92259ce1c444f45383f2687a4ce62
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:42:09 2009 +0100

    Imported Upstream version 0.6.1

commit d633391e4b821f11f95a6e29e2d69c8ca46a432c
Author: Dominic Hargreaves <dom at earth.li>
Date:   Sat Aug 9 18:13:25 2008 +0100

    Imported Debian patch 0.5.1-3

commit 1ad77a8d7507a136199326b4011ecff449f55296
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:40:53 2009 +0100

    Imported Upstream version 0.5.1

-----------------------------------------------------------------------

-- 
C++/Python toolkit for developing GIS applications