Mercurial > pidgin
diff libpurple/conversation.h @ 26767:47d03538ee3f
Fix a bad merge (*sigh*)
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 15ae2dea92b3 |
children | 63cb8c4f3c66 e57315a062cb |
author | Paul Aurich <paul@darkrain42.org> |
---|---|
date | Fri, 01 May 2009 18:57:44 +0000 |
parents | 15ae2dea92b3 |
children | 63cb8c4f3c66 e57315a062cb |