diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-26 12:33:32 +0200 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2010-05-26 12:33:32 +0200 |
| commit | 62223ff3a7fd8fc0eb008d9e9186625c022112ed (patch) | |
| tree | 02cfdde8490d0e704c11470c9fb627fdd104b189 /telepathy-logger/log-manager.h | |
| parent | bcbd2edb2558651a760839804423cfcb9afd805c (diff) | |
| parent | 3093b25b89535a174a5fc13e0531c98cf2382afa (diff) | |
| download | telepathy-logger-62223ff3a7fd8fc0eb008d9e9186625c022112ed.tar.gz | |
Merge branch 'ka-misc-27642'
Conflicts:
telepathy-logger/contact.h
Diffstat (limited to 'telepathy-logger/log-manager.h')
0 files changed, 0 insertions, 0 deletions