Mercurial > pidgin
comparison libpurple/purple-send @ 24974:93cc8982d4e5
explicit merge of '094ca19cc431d185c7b94947bfcd7cfc2d2f4a0b'
and 'a92ecd05b30230b85149a7c4edbcb269bc1c4841'
author | Mike Ruprecht <maiku@soc.pidgin.im> |
---|---|
date | Sat, 13 Dec 2008 08:48:58 +0000 |
parents | 942bf314fc8a |
children | cea56d000b16 |
comparison
equal
deleted
inserted
replaced
24971:1ce297c8923b | 24974:93cc8982d4e5 |
---|