diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-01-07 17:38:32 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2014-01-07 17:38:32 +0800 |
commit | df6bd22f9a320dad25eaffa5c061921de7ee351b (patch) | |
tree | f61da94f8e46787532dec185e31ea2310c2ba65d /libempathy-gtk | |
parent | 57396500ea506ca42677292b6ab8e0cf664e5f7f (diff) | |
parent | 4a0d05f76bb33b1a78c96333780d38b23cc74b16 (diff) | |
download | gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.gz gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.bz2 gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.lz gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.xz gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.tar.zst gsoc2013-empathy-df6bd22f9a320dad25eaffa5c061921de7ee351b.zip |
Merge branch 'gnome-3-10'
Conflicts:
NEWS
configure.ac
help/el/el.po
Diffstat (limited to 'libempathy-gtk')
0 files changed, 0 insertions, 0 deletions