]> err.no Git - mapper/commit
Merge branch 'master' of git+ssh://tal.org/home/git/mapper
authorKaj-Michael Lang <milang@tal.org>
Tue, 29 Apr 2008 13:16:07 +0000 (16:16 +0300)
committerKaj-Michael Lang <milang@tal.org>
Tue, 29 Apr 2008 13:16:07 +0000 (16:16 +0300)
commit2680045a98bd4dee109e54a8889291eef4c909ec
tree291ebea9dc71c52bb085deaed6449ab5fe7d2a50
parent1a882fea9ac182f65e230bd113bb4c8f21d23464
parent4e3383f7144c38333a3fecd5be472e0049dd7d5c
Merge branch 'master' of git+ssh://tal.org/home/git/mapper

Conflicts:

src/gtkmap.c
src/gtkmap.c