From: Kaj-Michael Lang <milang@onion.tal.org>
Date: Thu, 28 Jun 2007 13:03:25 +0000 (+0300)
Subject: Merge branch 'master' of git+ssh://tal.org/home/git/mapper
X-Git-Url: https://err.no/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=252ba744a8692aab5f6a4dd559b46cb7f8b30b51;p=mapper

Merge branch 'master' of git+ssh://tal.org/home/git/mapper

Resolve conflicts:

	src/map.c
---

252ba744a8692aab5f6a4dd559b46cb7f8b30b51
diff --cc src/map.c
index 2a180df,2cbb275..d6a534f
--- a/src/map.c
+++ b/src/map.c
@@@ -581,7 -579,13 +587,6 @@@ map_render_tile(guint tilex, guint tile
  
  	if (tilex < _world_size_tiles && tiley < _world_size_tiles) {
  		/* The tile is possible. */
 -		gchar buffer[BUFFER_SIZE];
 -		GError *error = NULL;
 -		gint zoff;
 -
 -		vprintf("%s(%u, %u, %u, %u)\n", __PRETTY_FUNCTION__,
 -			tilex, tiley, destx, desty);
--
  		for (zoff = (_curr_repo->double_size ? 1 : 0);
  		     !pixbuf && (_zoom + zoff) <= MAX_ZOOM
  		     && zoff <= TILE_SIZE_P2; zoff += 1) {