diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2013-03-01 15:11:53 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2013-03-01 15:11:53 +0000 |
| commit | 675565c73c265b7a545f45165ed97299890453fc (patch) | |
| tree | dc5844d417cbfe5b4b369d15d0f544de25dc1c10 /lib/ext | |
| parent | 73c80443fd8594212f1a0f9fb8a99a0a4d691dbc (diff) | |
| parent | ff28128c7699b7fee5757a742f07b4cf9c98764c (diff) | |
| download | telepathy-gabble-675565c73c265b7a545f45165ed97299890453fc.tar.gz | |
Merge branch 'telepathy-gabble-0.16'
Conflicts:
NEWS
configure.ac
lib/ext/wocky
Diffstat (limited to 'lib/ext')
| m--------- | lib/ext/wocky | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject 0fc8f511683054634d7ba5d447e38a634400eeb +Subproject d822581db0752351850b7e7ddfe3e70008897a5 |