diff options
| author | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 00:57:59 +0800 |
|---|---|---|
| committer | Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk> | 2011-04-28 00:57:59 +0800 |
| commit | 92172bae28e5fa2a91d87bc9e715c9bad01d888f (patch) | |
| tree | 5ab52ee86f040652b5caa29bae94455b3ee51221 /libempathy/empathy-idle.h | |
| parent | 2430f28d4659fdfc428b0bdf89d774b0c7b9cdc6 (diff) | |
| parent | 474cd4639af3a45919b69ae4a3cc637c376e90bd (diff) | |
| download | gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.gz gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.bz2 gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.lz gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.xz gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.tar.zst gsoc2013-empathy-92172bae28e5fa2a91d87bc9e715c9bad01d888f.zip | |
Merge remote-tracking branch 'pochu-public/log-window-619866' into empathy-skype
Conflicts:
libempathy-gtk/empathy-log-window.c
libempathy/empathy-message.c
Diffstat (limited to 'libempathy/empathy-idle.h')
0 files changed, 0 insertions, 0 deletions