diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-03 20:19:23 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-03 20:19:23 +0800 |
| commit | c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed (patch) | |
| tree | 4064eef2e8386c40d8c8eccacb33705f23e7fab7 /src/empathy-new-chatroom-dialog.c | |
| parent | eb3b3c918fdb99db70d539257e8a1723f280e821 (diff) | |
| parent | 63ded644beff3bb2501c3df640ca3af795b29e16 (diff) | |
| download | gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.gz gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.bz2 gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.lz gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.xz gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.tar.zst gsoc2013-empathy-c4a27edfc22b7edc1ea1d4b5dc325ed34a93eaed.zip | |
Merge branch 'gnome-3-8'
Conflicts:
src/empathy.c
Diffstat (limited to 'src/empathy-new-chatroom-dialog.c')
0 files changed, 0 insertions, 0 deletions