diff options
| author | Will Thompson <will.thompson@collabora.co.uk> | 2012-11-16 15:56:12 +0000 |
|---|---|---|
| committer | Will Thompson <will.thompson@collabora.co.uk> | 2012-11-16 15:56:12 +0000 |
| commit | 0195745c3e1516a4e5c694768b64941093f34719 (patch) | |
| tree | 46c712927a19157863d8ce12b01b90a98194f4bc /lib | |
| parent | 4159cf378f26e8cd17d875667c68a3446e084acd (diff) | |
| parent | 68b0e226381f21277c904cee88ce5013c5365456 (diff) | |
| download | telepathy-salut-0195745c3e1516a4e5c694768b64941093f34719.tar.gz | |
Merge branch 'telepathy-salut-0.8'
This updates the Wocky snapshot to include the stanza namespace fixes.
They don't seem to cause any problems.
Conflicts:
NEWS
configure.ac
lib/ext/wocky
src/tubes-channel.c
Diffstat (limited to 'lib')
| m--------- | lib/ext/wocky | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/lib/ext/wocky b/lib/ext/wocky -Subproject 8ad2d40ad4f1abb6c85db0a4b5404fac59d92ad +Subproject 762c8281d37f065a174220e802afc599df2bcfd |