Merge branch 'master' into wmts

qgis · Jun 4, 2012 · 18bafb3 · 18bafb3
2 parents 08a712a + dab4758
commit 18bafb3
Show file tree

Hide file tree

Showing 157 changed files with 95,133 additions and 98,153 deletions.
diff --git a/.mailmap b/.mailmap
@@ -0,0 +1,13 @@
+Juergen E. Fischer  <fischer@linux-buechse.de>
+Juergen E. Fischer  <jef@norbit.de>
+Nathan Woodrow  <madmanwoo@gmail.com>
+Nathan Woodrow  <woodrow.nathan@gmail.com>
+Nathan Woodrow  <woo@woo-mint.(none)>
+Marco Hugentobler   <marco@marco-laptop.(none)>
+Marco Hugentobler   <marco.hugentobler@sourcepole.ch>
+Marco Bernasocchi <marco@bernawebdesign.ch>
+Marco Bernasocchi <<marco@placebo.(none)>
+Marco Bernasocchi <marco@bernawebdesign.ch>
+Marco Bernasocchi <marco@bernawebdesign.ch>
+Gary Sherman    <gsherman@geoapt.com>
+Gary Sherman    <gsherman@c8812cc2-4d05-0410-92ff-de0c093fc19c>