Mercurial > pidgin.yaz
comparison libpurple/conversation.c @ 19122:6dded98d1c80
Fixed a merge error
author | Eric Polino <aluink@pidgin.im> |
---|---|
date | Fri, 29 Jun 2007 02:58:27 +0000 |
parents | ffd706ec0220 |
children | f4d05584369e 636679fb98ad |
comparison
equal
deleted
inserted
replaced
19121:bd44f661f4c8 | 19122:6dded98d1c80 |
---|