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

[David Paleino]

The branch, master has been created
        at  2f1dddbdec379691da7480bc4a40be9ad7fbc629 (commit)

- Shortlog ------------------------------------------------------------
commit 2f1dddbdec379691da7480bc4a40be9ad7fbc629
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:59:29 2009 +0100

    Imported debian 0.6.1-2 from old Git repository

commit ec2cc4ab342c3faa8bec8c1cdaee2f7a6dac85e1
Author: Dominic Hargreaves <dom at earth.li>
Date:   Mon Oct 19 23:28:32 2009 +0100

    Imported Debian patch 0.6.1-1

commit a38debbde25acbc59e6e2c6f809cd7af43fcbffa
Merge: a421905c48ebb695e60838b4839d9d1475d8d3b2 ea44b43c858315a0f87d4ea0e62fe32a1d09f3d1
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:58:31 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 ea44b43c858315a0f87d4ea0e62fe32a1d09f3d1
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:57:06 2009 +0100

    Imported Upstream version 0.6.1

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

    Imported Debian patch 0.5.1-3

commit ba024c7ccf71a1531f4f373420852f11ca2c16b8
Author: David Paleino <dapal at debian.org>
Date:   Tue Nov 10 09:56:34 2009 +0100

    Imported Upstream version 0.5.1

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

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