]> err.no Git - mapper/commit
Merge branch 'master' of git+ssh://tal.org/home/git/mapper
authorKaj-Michael Lang <milang@onion.tal.org>
Wed, 12 Sep 2007 08:01:27 +0000 (11:01 +0300)
committerKaj-Michael Lang <milang@onion.tal.org>
Wed, 12 Sep 2007 08:01:27 +0000 (11:01 +0300)
commit71b82f35a8dded69ae30b04c7819b34cbc349a3d
tree8a7c2c820eb8be1a1e0eef8856722f039b353118
parentba9c5ad28ef37b79ad3f19fce63f340c05811bb8
parent91700872861b9a6575091ae50d4d001abb3d769b
Merge branch 'master' of git+ssh://tal.org/home/git/mapper

Conflicts:

src/ui-common.c
src/map.c
src/osm-db.c
src/osm.h
src/ui-common.c