diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-10 15:26:52 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-06-10 15:26:52 +0100 |
| commit | 1fbfb30038dbdda78f79533138fec05a270ea485 (patch) | |
| tree | 99565ecb1537bcf44b5b93a934e413d66b3e5b45 /examples | |
| parent | 8e922eaeba7b7875b01697c4c1bac2df7e8ac1b9 (diff) | |
| parent | ba0b31b425d5871c4141ff0a7f477ec4e296e926 (diff) | |
| download | telepathy-glib-1fbfb30038dbdda78f79533138fec05a270ea485.tar.gz | |
Merge branch 'telepathy-glib-0.20'
Conflicts:
NEWS
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions