Mercurial > pidgin.yaz
comparison libpurple/server.c @ 22608:ae436d5e42d5
merge of '7477b26751dbf08e918a1f300fbd2697dd0c6369'
and '911e3a3a992368fcb0a43a90238092e27a92c581'
| author | Etan Reisner <pidgin@unreliablesource.net> |
|---|---|
| date | Fri, 04 Apr 2008 02:45:33 +0000 |
| parents | 3232cc79fa51 |
| children | b398fe0a450e 92e71f6e10d4 ab1185e87ca5 |
comparison
equal
deleted
inserted
replaced
| 22599:185b37776140 | 22608:ae436d5e42d5 |
|---|