Mercurial > pidgin.yaz
diff libpurple/protocols/jabber/ping.h @ 25379:4e8748f3374f
explicit merge of 'cfb115ff00c406f8011c0d661d33bee60813b27c'
and '65a6b2bf1ab03c791a4444120e325ce42d9471f2'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Fri, 02 Jan 2009 22:23:38 +0000 |
parents | 6ab1089e2101 |
children | e30e9779e7bf 42dd7e591031 |