diff options
| author | Colin Guthrie <cguthrie@mandriva.org> | 2009-11-20 16:58:28 +0000 |
|---|---|---|
| committer | Colin Guthrie <cguthrie@mandriva.org> | 2009-11-20 16:58:28 +0000 |
| commit | 3014081136b7d920940f085c0bc9b0e5c16fb398 (patch) | |
| tree | 0a1310a052f61f44a8178815f8379fec88f3c9e1 /src/daemon/main.c | |
| parent | 25537ffa0041b795f6fe76fb408cf26e73f69376 (diff) | |
| parent | 231417c8674c7e383bf538e8b1c4bcef13f084f6 (diff) | |
Merge branch '0.9.20-stable' into stable-queue
Conflicts:
src/Makefile.am
Diffstat (limited to 'src/daemon/main.c')
0 files changed, 0 insertions, 0 deletions