diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-25 19:04:18 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2014-03-27 10:32:14 +0000 |
| commit | ad0198d6511e4ae7df807539dccf699e914dd438 (patch) | |
| tree | 1d4dad64751850ee1d350fedfb94ee4a07bda216 /po/xh.po | |
| parent | 8f0e2aea3ccb9887450e4ebd7580d4f222d3c791 (diff) | |
| parent | 35ddfed09cfb7d36fe68425407847c8a63f1a5e4 (diff) | |
Merge branch 'master' into next
Conflicts:
configure.ac
extensions/Makefile.am
extensions/misc.xml
libempathy-gtk/empathy-call-utils.c
libempathy-gtk/empathy-call-utils.h
libempathy-gtk/empathy-chat.c
libempathy-gtk/empathy-share-my-desktop.c
libempathy/empathy-ft-handler.c
libempathy/empathy-request-util.c
libempathy/empathy-tp-chat.c
src/empathy-call-handler.c
telepathy-account-widgets
Diffstat (limited to 'po/xh.po')
0 files changed, 0 insertions, 0 deletions