comparison libpurple/protocols/jabber/jabber.h @ 22783:f160d3f5e070

merge of '08062d1b1267b18fa3d47ea8eded7e2b826b7e8c' and '0ed9d51dcce10da3af15dd44273af472eea6cb0c'
author Mark Doliner <mark@kingant.net>
date Tue, 29 Apr 2008 05:39:10 +0000
parents 23fe481afccf
children aaaff38e144f 224169be5830 69d54f84350a 26eabe8e739b
comparison
equal deleted inserted replaced
22782:a95fcf01f72c 22783:f160d3f5e070