]> err.no Git - mapper/commitdiff
Merge branch 'master' of ssh://git.tal.org/home/git/mapper
authorKaj-Michael Lang <milang@tal.org>
Thu, 28 Feb 2008 20:35:17 +0000 (22:35 +0200)
committerKaj-Michael Lang <milang@tal.org>
Thu, 28 Feb 2008 20:35:17 +0000 (22:35 +0200)
1  2 
src/Makefile.am

diff --cc src/Makefile.am
Simple merge