comparison libpurple/protocols/msn/nexus.c @ 20519:8a4748cbf844

explicit merge of '5d4b00a88466bb9e851eaca42ab3fd3f2c4093ef' and '26aa195b85d196378bd98ee299a60fac553d5bcd'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:07:46 +0000
parents 723b5a2f91ce
children 719ce4acfcb9 2c8c6d77f12c
comparison
equal deleted inserted replaced
20518:4b20ec37460f 20519:8a4748cbf844