  )
  # number of concurrent requests to a tile source
  
-diff -Nur -x '*.orig' -x '*~' mapproxy_trunk//mapproxy/image/fonts/LICENSE mapproxy_trunk.new//mapproxy/image/fonts/LICENSE
---- mapproxy_trunk//mapproxy/image/fonts/LICENSE	2011-05-24 12:10:12.269506668 +0200
-+++ mapproxy_trunk.new//mapproxy/image/fonts/LICENSE	1970-01-01 01:00:00.000000000 +0100
+Index: mapproxy/mapproxy/image/fonts/LICENSE
+===================================================================
+--- mapproxy.orig/mapproxy/image/fonts/LICENSE	2015-07-17 09:16:34.000000000 +0000
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,99 +0,0 @@
 -Fonts are (c) Bitstream (see below). DejaVu changes are in public domain.
 -Glyphs imported from Arev fonts are (c) Tavmjong Bah (see below)

diff -Nur -x '*.orig' -x '*~' mapproxy_trunk//mapproxy/config/defaults.py mapproxy_trunk.new//mapproxy/config/defaults.py
--- mapproxy_trunk//mapproxy/config/defaults.py	2011-05-24 12:26:58.129903954 +0200
+++ mapproxy_trunk.new//mapproxy/config/defaults.py	2011-05-24 12:29:48.828784289 +0200
@@ -43,7 +43,7 @@
     max_shrink_factor = 4.0,
     paletted = True,

-. fr.
-
-$Id: LICENSE 2133 2007-11-28 02:46:28Z lechimp $
