diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-28 11:25:42 +0100 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-11-28 11:25:42 +0100 |
| commit | 111576f9ba3bdaa1df0ebd81be3601c816c43bb9 (patch) | |
| tree | 9c5088984467458bebb3ef7561be163bf9b75cc0 /configure.ac | |
| parent | 175f74a06a124c699595503c55ac26be5086b3bc (diff) | |
| parent | 6e1187c3634e284254874a65349196ba7cb150d8 (diff) | |
Merge branch 'telepathy-glib-0.16'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions