comparison libpurple/protocols/zephyr/ZMakeAscii.c @ 32508:e21500d61347

merge of '2825cfec5e2f9ce0b43361fdd7bdd21c4ea69b24' and '4a5d49d94ae44a21c23f7977dd7b6b9f69dfb000'
author andrew.victor@mxit.com
date Mon, 05 Sep 2011 18:34:32 +0000
parents a8cc50c2279f
children
comparison
equal deleted inserted replaced
32507:5d81b452dcc4 32508:e21500d61347