Code

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)
commit03576db7496264c5e7054e6cc765db0beea4a0da
tree93ff8b7c907c88f62edbeaf15f39a45c3cec73ce
parent576d966de9a98aacd1a2740abb349022cc32d913
parenteb78f4965a6a2cd25c54ffb832f5e42744d968ad
Merge branch 'sh/next'
src/Makefile.am
src/configfile.c