Mercurial > pidgin
diff libpurple/protocols/oscar/odc.c @ 21799:f14da598bffe
merge of '078fbf9229f1725f0a5c49d8196cd59ee1d638b0'
and '5906d2431bf8290785e449b059fa995d73f2a4bc'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Fri, 07 Dec 2007 22:14:23 +0000 |
parents | 35b4f1dc4c8d |
children | 6f5f0a4de7f4 |