diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:32:33 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-07-23 15:32:33 +0200 |
| commit | 638f9a561e8353ae9bd7e07e4f42e4c4f53f617e (patch) | |
| tree | c5a353a272eb8a590fd3a9233cba169e9ed051e7 /src/daemon/daemon-conf.c | |
| parent | 88d5749f6ae8d391963a12a6221f006de2947e50 (diff) | |
| parent | 0aca5ad3c09ea3e2202209e17808ec1bb86e5ac2 (diff) | |
Merge branch 'master-tx'
Conflicts:
po/ca.po
po/cs.po
po/de.po
po/es.po
po/pl.po
Diffstat (limited to 'src/daemon/daemon-conf.c')
0 files changed, 0 insertions, 0 deletions