Mercurial > pidgin.yaz
comparison libpurple/protocols/jabber/caps.h @ 24276:06a4e268b9f5
merge of '843d513c3da12026fc35af070a23a3d11844824c'
and 'b630f3305c53ab0eb32b948911940959cc873699'
author | John Bailey <rekkanoryo@rekkanoryo.org> |
---|---|
date | Thu, 30 Oct 2008 03:58:19 +0000 |
parents | f88b3a093cba |
children | aaaff38e144f 26eabe8e739b 5767b7698c73 |
comparison
equal
deleted
inserted
replaced
24273:6f7b24a2b746 | 24276:06a4e268b9f5 |
---|