comparison libpurple/core.h @ 20517:2ebde8bd0e58

explicit merge of '7ca52e5d60c8f4d7842faad73378b57df9db9007' and 'b1148e355b30c726e5fdcc11dc57ddb0cc8736ea'
author Richard Laager <rlaager@wiktel.com>
date Sun, 16 Sep 2007 18:06:22 +0000
parents 44b4e8bd759b
children 6bf32c9e15a7
comparison
equal deleted inserted replaced
19731:97559afd70e4 20517:2ebde8bd0e58