diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-28 14:21:04 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2012-08-28 14:21:04 +0100 |
| commit | 9ad89f9a9a35467ce5649070b0207a91cbbd251b (patch) | |
| tree | b4f1eae19b9a8d8c7b33949dfc0c73ab29633326 /configure.ac | |
| parent | de9b0d133c83c6340b1797040a236367dadcf2dd (diff) | |
| parent | f374056b8abf3a4179836faf1f397dfa1213c5ae (diff) | |
| download | telepathy-salut-9ad89f9a9a35467ce5649070b0207a91cbbd251b.tar.gz | |
Merge branch 'cheerio-tubes'
Conflicts:
src/tubes-channel.c
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
Diffstat (limited to 'configure.ac')
0 files changed, 0 insertions, 0 deletions