diff options
| author | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2009-11-03 20:55:26 +0800 |
|---|---|---|
| committer | Danielle Madeley <danielle.madeley@collabora.co.uk> | 2009-11-03 20:55:26 +0800 |
| commit | f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd (patch) | |
| tree | 97c141ea0f439c548360792ccdf03b2af8cffbd4 /libempathy-gtk/empathy-contact-dialogs.c | |
| parent | 8b15780d062dfb9263a173ff486fd767f6d47d2c (diff) | |
| parent | ede64d4975a1fca4a562e4635dc43856610788ed (diff) | |
| download | gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.tar gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.tar.gz gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.tar.bz2 gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.tar.lz gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.tar.xz gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.tar.zst gsoc2013-empathy-f72e6ddce1c1fd2ac17e11b3fcd285d08ba787dd.zip | |
Merge branch 'fix-586098'
Conflicts:
libempathy-gtk/empathy-chat.c
Diffstat (limited to 'libempathy-gtk/empathy-contact-dialogs.c')
0 files changed, 0 insertions, 0 deletions