diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-26 17:26:29 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-10-26 17:26:29 +0100 |
| commit | ee8afcddffa6bbd35acc6822de4a97b3106bed08 (patch) | |
| tree | 4b0a91335c9ef0a518e65c0bebf1eac98442a5d5 /spec | |
| parent | 7c81e9c6c3cf08bccad085929911ecd393cea65f (diff) | |
| parent | 71ec9005303d80f6d42cf70cdc9578bcfe39930d (diff) | |
| download | telepathy-glib-ee8afcddffa6bbd35acc6822de4a97b3106bed08.tar.gz | |
Merge branch 'telepathy-glib-0.12'
Conflicts:
NEWS
configure.ac
Diffstat (limited to 'spec')
0 files changed, 0 insertions, 0 deletions