Mercurial > pidgin
comparison libpurple/plugins/psychic.c @ 21924:e9005670e279
merge of 'f6430c7013d08f95c60248eeb22c752a0107499b'
and 'f84b5a4f3cdf2a2a92ff24e79e6aa6c2e0c8c1aa'
author | Etan Reisner <pidgin@unreliablesource.net> |
---|---|
date | Sat, 22 Dec 2007 23:18:08 +0000 |
parents | 3cc856ca2338 |
children | 2ab648c328cc |
comparison
equal
deleted
inserted
replaced
21922:d7f1231cc21a | 21924:e9005670e279 |
---|