comparison libpurple/protocols/jabber/caps.c @ 23157:bc58e2d9f0f5

merge of '979e05e68e2d32cdffe65f350b71fd6e6ae89af9' and 'df0ddcef268608879c9e3ecd095cb74903d279e8'
author Etan Reisner <pidgin@unreliablesource.net>
date Fri, 16 May 2008 03:18:27 +0000
parents 6f4ffdc65230
children aaaff38e144f d79c30d1582a 26eabe8e739b 92e71f6e10d4
comparison
equal deleted inserted replaced
23156:b17d6defb922 23157:bc58e2d9f0f5