Mercurial > pidgin
diff libpurple/protocols/zephyr/ZFlsLocs.c @ 17199:204cbfeae945
merge of '313e5f0e5697afe45ac3ac1160aa4de526089ba2'
and 'ce9cdd5d43f18f094312c5c88c6b6406398f0f3b'
author | Stu Tomlinson <stu@nosnilmot.com> |
---|---|
date | Wed, 23 May 2007 01:22:20 +0000 (2007-05-23) |
parents | 5fe8042783c1 |
children | a8cc50c2279f |