![[tokkee]](http://tokkee.org/images/avatar.png){kind=avatar}
| author | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100) | ||
| committer | Florian Forster <octo@leeloo.lan.home.verplant.org> | |
| Sat, 8 Nov 2008 08:01:12 +0000 (09:01 +0100) | ||
| commit | 03576db7496264c5e7054e6cc765db0beea4a0da | |
| tree | 93ff8b7c907c88f62edbeaf15f39a45c3cec73ce | tree | snapshot |
| parent | 576d966de9a98aacd1a2740abb349022cc32d913 | commit | diff |
| parent | eb78f4965a6a2cd25c54ffb832f5e42744d968ad | commit | diff |
Merge branch 'sh/next'
| src/Makefile.am | diff1 | | diff2 | | blob | history |
| src/configfile.c | diff1 | | diff2 | | blob | history |