Permalink
Browse files

Merge remote-tracking branch 'upstream/master'

  • Loading branch information...
2 parents fe652b2 + 82905e6 commit ae72e26164d3c1e717a515269da39ff0a3773ef6 @avlee committed Sep 14, 2012
Showing 1,455 changed files with 86,013 additions and 66,895 deletions.
View
@@ -39,7 +39,16 @@ tests/data/sqlite/*index
demo/c++/cairo-demo.pdf
demo/c++/cairo-demo.png
demo/c++/cairo-demo256.png
+demo/c++/cairo-demo.svg
+demo/c++/demo.tif
demo/c++/demo.jpg
demo/c++/demo.png
demo/c++/demo256.png
-
+demo/viewer/Makefile
+demo/viewer/Makefile.Debug
+demo/viewer/Makefile.Release
+demo/viewer/release/
+demo/viewer/ui_about.h
+demo/viewer/ui_info.h
+demo/viewer/ui_layer_info.h
+tests/cpp_tests/*-bin
View
@@ -2,60 +2,61 @@
Mapnik is written by Artem Pavlenko with contributions from:
-Andy Allen
-AJ Ashton
-Matt Amos
-Lucio Asnaghi
-Justin Bronn
-Christopher Brown
-Jon Burgess
-Toby Collet
-Robert Coup
-Berteun Damman
-Craig de Stigter
-Jean-Francois Doyon
-David Eastcott
-Krzysztof Godlewski
-Beau Gunderson
-John Hague
-Dominic Hargreaves
-Aubrey Holland
-Tom Hughes
-Konstantin Käfer
-Mak Kolybabi
-Peter Körner
-Hermann Kraus
-Stella Laurenzo
-David Leaver
-Carlos López
-Dennis Luxen
-Tom MacWright
-Michal Migurski
-Andrii Mishkovskyi
-Ben Moores
-Dražen Odobašić
-Cameron Patrick
-Igor Podolskiy
-Reid Priedhorsky
-Brian Quinion
-Marcin Rudowski
-Christopher Schmidt
-Andreas Schneider
-Vincent Schut
-Ehud Shabtai
-David Siegel
-Steve Singer
-Paul Smith
-Vince Spader
-Philipp Spitzer
-Dane Springmeyer
-Dave Stubbs
-River Tarnell
-Oliver Tonnhofer
-Alberto Valverde
-Martijn van Oosterhout
-Andreas Volz
-Lennard voor den Dag
-Shaun Walbridge
-Nick Whitelegg
-Leslie Wu
+* Andy Allen
+* AJ Ashton
+* Matt Amos
+* Lucio Asnaghi
+* Justin Bronn
+* Christopher Brown
+* Jon Burgess
+* Toby Collet
+* Robert Coup
+* Berteun Damman
+* Craig de Stigter
+* Jean-Francois Doyon
+* David Eastcott
+* Krzysztof Godlewski
+* Beau Gunderson
+* John Hague
+* Dominic Hargreaves
+* Aubrey Holland
+* Tom Hughes
+* Konstantin Käfer
+* Mak Kolybabi
+* Peter Körner
+* Hermann Kraus
+* Stella Laurenzo
+* David Leaver
+* Carlos López
+* Dennis Luxen
+* Tom MacWright
+* Michal Migurski
+* Andrii Mishkovskyi
+* Ben Moores
+* Dražen Odobašić
+* Cameron Patrick
+* Igor Podolskiy
+* Reid Priedhorsky
+* Brian Quinion
+* Marcin Rudowski
+* Christopher Schmidt
+* Andreas Schneider
+* Vincent Schut
+* Ehud Shabtai
+* David Siegel
+* Steve Singer
+* Paul Smith
+* Vince Spader
+* Philipp Spitzer
+* Dane Springmeyer
+* Dave Stubbs
+* River Tarnell
+* Oliver Tonnhofer
+* Alberto Valverde
+* Martijn van Oosterhout
+* Andreas Volz
+* Lennard voor den Dag
+* Shaun Walbridge
+* Rich Wareham
+* Nick Whitelegg
+* Leslie Wu
Oops, something went wrong.

0 comments on commit ae72e26

Please sign in to comment.