comparison libpurple/conversation.c @ 21018:aed039f5360b

merge of '624a8a3a5fd07708e24e8238a0d745c857ca9c72' and '9d0fba0e0edc763a880b7b5261ae1023f340c97b'
author Daniel Atallah <daniel.atallah@gmail.com>
date Fri, 26 Oct 2007 05:07:17 +0000
parents eb758ca32ea9
children bd7244f3d491 591267f6f1d5 26f55eb6ab59
comparison
equal deleted inserted replaced
21015:787b3897ba9f 21018:aed039f5360b