diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-12-10 16:57:03 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-12-10 16:57:03 +0000 |
| commit | 0e8974c8c464447f2fb6b46132de5eb52157178a (patch) | |
| tree | 648d448f74bb18fc014db52ac946cc550110c667 /configure.ac | |
| parent | 21fe8cac5062b0e87c8bb46f6db00675b09a1b1f (diff) | |
| parent | 7570666e34f4f051f36926c8fb3b9a6d998e5d82 (diff) | |
Merge branch 'telepathy-glib-0.12'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions