Merge branch 'sh/next'
authorFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100)
committerFlorian Forster <octo@leeloo.lan.home.verplant.org>
Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100)
1  2 
src/Makefile.am
src/configfile.c

diff --cc src/Makefile.am
Simple merge
Simple merge