diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-11 17:09:08 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2012-04-11 17:09:52 +0800 |
commit | bb1cf54832b5c3b29744407de9189cd63af9c3c2 (patch) | |
tree | c6a9439cdabd11b577223f9f6ff5923e035a4a8c /src/empathy-auth-client.c | |
parent | b8e7e162b685196577a7fc7fd4b56c173e76c40e (diff) | |
parent | 25a167b368cfa169810f4fc6c8d4b9c6adba8aef (diff) | |
download | gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.gz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.bz2 gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.lz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.xz gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.tar.zst gsoc2013-empathy-bb1cf54832b5c3b29744407de9189cd63af9c3c2.zip |
Merge branch 'gnome-3-4'
Conflicts:
po/ca@valencia.po
Diffstat (limited to 'src/empathy-auth-client.c')
0 files changed, 0 insertions, 0 deletions