]> err.no Git - mapper/commit
Merge commit 'origin'
authorKaj-Michael Lang <milang@onion.tal.org>
Mon, 15 Oct 2007 12:56:25 +0000 (15:56 +0300)
committerKaj-Michael Lang <milang@onion.tal.org>
Mon, 15 Oct 2007 12:56:25 +0000 (15:56 +0300)
commitfa468ad0ecfdfb71d46308009164db4011ac3100
tree95544641176be5d225b25f61c4747c9e0c0b48c2
parentc3f003fa3c09547e09c0f4adcb2133aac1cee7f8
parentf5b9f67296456957e2f4b8143d3f37cfd10a2537
Merge commit 'origin'

Conflicts:

src/mapper.c
src/gtkcompass.c
src/mapper.c
src/ui-common.c