Mercurial > pidgin
diff ChangeLog @ 28959:3de19f8f5c92
merge of '57bf84117d335fd0bba1edff4c5b3b21e29f6bbc'
and '681fb86466372d3d72fbfb554c0b766c81d763e6'
| author | Marcus Lundblad <ml@update.uu.se> |
|---|---|
| date | Wed, 03 Feb 2010 22:48:03 +0000 |
| parents | 57550ffb7870 0629b6814963 |
| children | 9af18bfb16aa 422889fb57e0 |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 03 22:19:11 2010 +0000 +++ b/ChangeLog Wed Feb 03 22:48:03 2010 +0000 @@ -5,6 +5,8 @@ * Fix 'make check' on OS X. (David Fang) * Fix a quirk in purple_markup_html_to_xhtml that caused some messages to be improperly converted to XHTML. + * Set "controlling-mode" correctly when initializing a media session. + Fixes receiving voice calls from Psi. General: * Correctly disable all missing dependencies when using the
