diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-06 19:05:29 +0100 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2010-04-06 19:05:29 +0100 |
| commit | 4b6a220a4efb6a091d02402af2794bde1f09ebbe (patch) | |
| tree | c93630ca9c28565008b2190680f1fb96d51405bf | |
| parent | 08bc15ac99d9b6224bee7f585101261a1f913f21 (diff) | |
| parent | 2fdba1ce53d4111240970ebc79b7b1aeb99a7394 (diff) | |
Merge branch 'telepathy-glib-0.8' into telepathy-glib-0.10
Conflicts:
NEWS
configure.ac
| -rw-r--r-- | NEWS | 13 |
1 files changed, 12 insertions, 1 deletions
@@ -3,11 +3,22 @@ telepathy-glib 0.10.3 (UNRELEASED) Fixes: -* tp_account_set_nickname_async: set the right source_tag (cassidy) +* Don't fail 'make check' if gtk-doc complains that the documentation is + incomplete, since this is a stable branch, but gtk-doc's definition of + "complete" changes from release to release (smcv) + +* Don't warn/error if we're using deprecated functions, since this is a stable + branch, so it's not going to be fixed here (smcv) + +Documentation: * fd.o #27281: clarify documentation for tp_message_mixin_sent, using telepathy-spec 0.19.2 as a reference (Maiku) +* Improve documentation of TpContactsMixinFillContactAttributesFunc (mikhailz) + +* tp_account_set_nickname_async: set the right source_tag (cassidy) + telepathy-glib 0.10.2 (2010-03-31) ================================== |