comparison libpurple/network.h @ 28747:ebb424b7e0a1

merge of '0bd5c5d235ae8c70b289e3b55a19523c4e28539e' and '9ba62902a7be15503ccd0006cd59c73fecc6255c'
author Mark Doliner <mark@kingant.net>
date Thu, 03 Dec 2009 08:02:54 +0000
parents c55bba399426
children 836544f3b81f 02f6f49da454
comparison
equal deleted inserted replaced
28738:9750ec16f325 28747:ebb424b7e0a1