comparison libpurple/conversation.h @ 21871:91684de72a5c

merge of 'adb528a403db408f5e4407e89f98f7ced3cac9a1' and 'da678e8fa88f2fe112926c0fabd070fda4d551f0'
author Stu Tomlinson <stu@nosnilmot.com>
date Tue, 18 Dec 2007 16:10:22 +0000
parents 6de09629f091
children 8eb1846b5c40
comparison
equal deleted inserted replaced
21866:03c950701fac 21871:91684de72a5c