Mercurial > pidgin.yaz
diff libpurple/conversation.h @ 32176:f2a3c59fc4a6
Fix up merge
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | 4dabe4bdfb29 |
children | 9aee8493db7f c0a423e7fea4 |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Sat, 25 Jun 2011 19:56:59 +0000 |
parents | 4dabe4bdfb29 |
children | 9aee8493db7f c0a423e7fea4 |