Mercurial > pidgin
comparison libpurple/prefs.h @ 17107:3034129a10b6
explicit merge of 'bb7e144daba6e060c1f8ed699733a119ea3e107f'
and '37064abba4819599b4b7ad9b9301856633236f2f'
to branch 'im.pidgin.pidgin'
| author | Richard Laager <rlaager@wiktel.com> |
|---|---|
| date | Sat, 19 May 2007 07:49:39 +0000 |
| parents | 32c366eeeb99 |
| children | 69e0551deebe 8af9ebae439c 0e30dfac1f46 |
comparison
equal
deleted
inserted
replaced
| 17106:9fae99335d35 | 17107:3034129a10b6 |
|---|