diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-05-21 17:18:19 +0800 |
| commit | 26b9e04f1c40888bba66bcaace30d9f0feac45fc (patch) | |
| tree | c191578379fbc693b0616b4fd933f8f3322d4dd2 /src/empathy-chat.c | |
| parent | 19d2ee5fe81b850c8300dca6583e9c49bf6f7afd (diff) | |
| parent | 2b263049bd152504227c9ade7e7b6e17cbc95f11 (diff) | |
| download | gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.gz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.bz2 gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.lz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.xz gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.tar.zst gsoc2013-empathy-26b9e04f1c40888bba66bcaace30d9f0feac45fc.zip | |
Merge branch 'gnome-3-4'
Conflicts:
NEWS
configure.ac
src/empathy-accounts.c
Diffstat (limited to 'src/empathy-chat.c')
0 files changed, 0 insertions, 0 deletions