Mercurial > pidgin.yaz
comparison libpurple/prefs.c @ 21106:95684692f622
fix up bad merge the bad way
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 08:32:44 +0000 |
parents | 3d7f36c57e68 |
children | f2cf1d61a676 |
comparison
equal
deleted
inserted
replaced
21105:66424ff7b9db | 21106:95684692f622 |
---|