comparison libpurple/protocols/sametime/sametime.h @ 27139:4892e488916a

merge of '225e515a43307f04c7c0570ba5877858a0f71209' and '558f5ed16016e9ba8c7b5ccc6da9afb53de7ce3d'
author Paul Aurich <paul@darkrain42.org>
date Mon, 22 Jun 2009 02:53:47 +0000
parents 32c366eeeb99
children
comparison
equal deleted inserted replaced
27138:2967cea30d8b 27139:4892e488916a