Mercurial > pidgin.yaz
comparison libpurple/protocols/zephyr/ZGetLocs.c @ 27494:d9ee3adfee58
merge of 'd4111c3c390e4fbea55bfa213f353d6012f249d5'
and 'e6faf7cfc687458f9e3d8f8a88c339de80843fc5'
author | Gary Kramlich <grim@reaperworld.com> |
---|---|
date | Wed, 08 Jul 2009 00:50:29 +0000 |
parents | 5fe8042783c1 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
27491:531454a6026d | 27494:d9ee3adfee58 |
---|