diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-29 22:56:11 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-29 22:56:11 +0800 |
| commit | b5764db7cf39aeaaabc261ece49c57776540a0be (patch) | |
| tree | 7cadc15c0f9c1c9b7ff7d21de7020201add612aa /libempathy/empathy-connection-aggregator.h | |
| parent | 67869e50ff885ea10280447edbe6ee22520e26cb (diff) | |
| parent | 82b0f4038f7c257253962080270e5625dd5de152 (diff) | |
| download | gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.gz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.bz2 gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.lz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.xz gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.tar.zst gsoc2013-empathy-b5764db7cf39aeaaabc261ece49c57776540a0be.zip | |
Merge remote-tracking branch 'jonny/ft'
Conflicts:
libempathy/empathy-tp-file.c
Diffstat (limited to 'libempathy/empathy-connection-aggregator.h')
0 files changed, 0 insertions, 0 deletions