Mercurial > pidgin
comparison libpurple/protocols/oscar/oft.c @ 17160:251ed95cc52c
merge of '211be57922bc0273e193942f976264ae52d8cf41'
and '7fa526ccf77d3d2da927a55aa8115be7e1be184d'
author | Richard Laager <rlaager@wiktel.com> |
---|---|
date | Sun, 20 May 2007 15:02:03 +0000 |
parents | 32c366eeeb99 |
children | 1927f4ead3ca |
comparison
equal
deleted
inserted
replaced
17158:fdd52f7651c7 | 17160:251ed95cc52c |
---|