diff options
| author | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
|---|---|---|
| committer | Tanu Kaskinen <tanuk@iki.fi> | 2009-10-02 17:24:44 +0300 |
| commit | 019331d25b6af107fb8cacc3ada552e7567a64bf (patch) | |
| tree | d5545e795e164fb6cd8edae1a45e7b8bb966ee12 /src/daemon/caps.c | |
| parent | 587131917f9129c8347c789febb7e755dfb091de (diff) | |
| parent | afd1b6d355ef1a41cb3592485855e273a5de69c1 (diff) | |
Merge branch 'master' into dbus-work
Conflicts:
src/daemon/daemon-conf.c
Diffstat (limited to 'src/daemon/caps.c')
0 files changed, 0 insertions, 0 deletions