Mercurial > pidgin
diff libpurple/protocols/jabber/si.h @ 23924:5e4aa29dc06f
merge of '9db6cf3ac465ef3a7aca0eee0f47e02d3ea7b162'
and 'df9bd43dee8443645563807861da728cd7ae6e26'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Mon, 18 Aug 2008 16:03:19 +0000 |
parents | 44b4e8bd759b |
children | d33fcdbd6ebc b4ec5481a67a e30e9779e7bf |