comparison libpurple/protocols/jabber/Makefile.am @ 17829:b1754db7010b

merge of '1e340ceaf355a27660847defa34d87510ce35d6d' and 'fbd7e09eb7982024bdb675a64ce31c7410e0b220'
author Stu Tomlinson <stu@nosnilmot.com>
date Mon, 11 Jun 2007 00:23:35 +0000
parents 6f54b1e84610
children 5c1ed6296b56 315151da0dc6
comparison
equal deleted inserted replaced
17823:91460e381dbc 17829:b1754db7010b