diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-11 17:47:41 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2011-11-11 17:47:41 +0000 |
| commit | a39ac85357a6855aa629b35169ae8eb488667372 (patch) | |
| tree | 8b7434307cb6e1fb14515143305ffea30395e435 /tools | |
| parent | d6118003e5bed41b62b18c080fd50eccc5db2aea (diff) | |
| parent | 079837c22b691658d6748f54a2124ab5c847e639 (diff) | |
| download | telepathy-glib-a39ac85357a6855aa629b35169ae8eb488667372.tar.gz | |
Merge branch 'telepathy-glib-0.16'
Conflicts:
configure.ac
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions