diff options
| author | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 22:22:43 +0800 |
|---|---|---|
| committer | Stef Walter <stefw@collabora.co.uk> | 2011-03-22 22:22:43 +0800 |
| commit | 6c5affb1f943b6685a0ac63adcfff24b47be6e2e (patch) | |
| tree | 1e614836c265504c1c7c29911d5d1b8caac0f04c /libempathy-gtk/empathy-protocol-chooser.c | |
| parent | 5316d721a24d2c1c2496f751a4cf139d88e274c1 (diff) | |
| parent | 698675bdc1fbc7e6e622be24e272df7e70f34716 (diff) | |
| download | gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.gz gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.bz2 gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.lz gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.xz gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.tar.zst gsoc2013-empathy-6c5affb1f943b6685a0ac63adcfff24b47be6e2e.zip | |
Merge branch 'reference-identities'
Conflicts:
libempathy/empathy-server-tls-handler.c
Diffstat (limited to 'libempathy-gtk/empathy-protocol-chooser.c')
0 files changed, 0 insertions, 0 deletions