diff options
| author | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-22 09:12:49 +0100 |
|---|---|---|
| committer | Jonny Lamb <jonny.lamb@collabora.co.uk> | 2011-04-22 09:12:49 +0100 |
| commit | 456667da199ede4d4000577d67b915e4e3437063 (patch) | |
| tree | 37091862f7905e93c67a01caa10db71a2a03e1f0 /lib | |
| parent | 62ebf96742349fe72411ef8cb03ddb511e80cd94 (diff) | |
| parent | 395324b1dab0e8b03b0ae44704a1347fefb3776b (diff) | |
| download | telepathy-salut-456667da199ede4d4000577d67b915e4e3437063.tar.gz | |
Merge branch 'caps'
Conflicts:
configure.ac
lib/ext/wocky
src/salut-caps-hash.c
src/salut-caps-hash.h
Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
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 a36dd1fec168abf1924757aeba7124172b9a79f +Subproject 3d8bd1bd1e3857f1a14dbba92a8fe6bf7f79005 |