From: Kaj-Michael Lang <milang@angel.tal.org>
Date: Thu, 9 Aug 2007 13:10: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=07eefdd53a1f248f7eb2d1592ba906761100cbbf;p=mapper

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

Conflicts:

	src/mapper.c
	src/utils.c
---

07eefdd53a1f248f7eb2d1592ba906761100cbbf
diff --cc src/mapper.c
index ca18db5,47fc90e..72f6c66
--- a/src/mapper.c
+++ b/src/mapper.c
@@@ -59,7 -61,8 +61,9 @@@
  #include "bt.h"
  #include "ui-common.h"
  #include "db.h"
 +#include "osm-db.h"
+ #include "cb.h"
+ #include "speak.h"
  
  gfloat UNITS_CONVERT[] = {1.85200,1.15077945,1.f,};