Mercurial > pidgin.yaz
comparison libpurple/protocols/zephyr/ZNewLocU.c @ 25379:4e8748f3374f
explicit merge of 'cfb115ff00c406f8011c0d661d33bee60813b27c'
and '65a6b2bf1ab03c791a4444120e325ce42d9471f2'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:23:38 +0000 |
parents | 5fe8042783c1 |
children | a8cc50c2279f |
comparison
equal
deleted
inserted
replaced
25378:47540809ae91 | 25379:4e8748f3374f |
---|