Mercurial > pidgin.yaz
diff libpurple/buddyicon.h @ 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 | 6bf32c9e15a7 |
children | 76af23621e19 |
author | Ka-Hing Cheung <khc@hxbc.us> |
---|---|
date | Thu, 25 Oct 2007 08:32:44 +0000 |
parents | 6bf32c9e15a7 |
children | 76af23621e19 |