diff options
author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-24 22:00:49 +0800 |
---|---|---|
committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2013-05-24 22:00:49 +0800 |
commit | 9d408bd199a0b577eaec9826df060397578f3a37 (patch) | |
tree | 9f4aebf460948f1196a20893a790fa4c58efde1b /src/empathy-chat-manager.h | |
parent | 138123c86b9e6a6bf67a188d1e67bd0444c7ebff (diff) | |
parent | ec619f9805258aa9d623e2651fb604b80d49f795 (diff) | |
download | gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.gz gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.bz2 gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.lz gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.xz gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.tar.zst gsoc2013-empathy-9d408bd199a0b577eaec9826df060397578f3a37.zip |
Merge branch 'gnome-3-8'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'src/empathy-chat-manager.h')
0 files changed, 0 insertions, 0 deletions