comparison libpurple/theme-loader.c @ 30601:fc8f98d1e81f

merge of '2e94598029dc6350d656fd335ad83738ff0c8e29' and '5e3707fd727a9e7f1d26a84dbf06be284072fd1f'
author Marcus Lundblad <ml@update.uu.se>
date Thu, 10 Jun 2010 20:35:08 +0000
parents ac1ad1fa5ecf
children 4d92a431d0a1
comparison
equal deleted inserted replaced
30600:8cb39e235f39 30601:fc8f98d1e81f