Merge lp://qastaging/~darkxst/ubuntu/quantal/telepathy-logger/lp1049210 into lp://qastaging/ubuntu/quantal/telepathy-logger
Proposed by
Tim Lunn
| Status: | Merged |
|---|---|
| Merge reported by: | Tim Lunn |
| Merged at revision: | not available |
| Proposed branch: | lp://qastaging/~darkxst/ubuntu/quantal/telepathy-logger/lp1049210 |
| Merge into: | lp://qastaging/ubuntu/quantal/telepathy-logger |
| Diff against target: |
5863 lines (+362/-2642) 24 files modified
.pc/.quilt_patches (+1/-0) .pc/.quilt_series (+1/-0) .pc/.version (+1/-0) debian/changelog (+15/-0) debian/gbp.conf (+1/-1) debian/patches/0001-Fix-introspection-warnings.patch (+306/-0) debian/patches/0002-log-manager-Fix-annotations-on-get_filtered_events.patch (+35/-0) debian/patches/series (+2/-0) doc/reference/libtelepathy-logger/html/TplEntity.html (+0/-316) doc/reference/libtelepathy-logger/html/TplEvent.html (+0/-275) doc/reference/libtelepathy-logger/html/TplLogManager.html (+0/-751) doc/reference/libtelepathy-logger/html/TplTextEvent.html (+0/-264) doc/reference/libtelepathy-logger/html/index.sgml (+0/-98) doc/reference/libtelepathy-logger/telepathy-logger.types (+0/-6) doc/reference/libtelepathy-logger/tmpl/call-channel-internal.sgml (+0/-45) doc/reference/libtelepathy-logger/tmpl/call-event-internal.sgml (+0/-57) doc/reference/libtelepathy-logger/tmpl/call-event.sgml (+0/-99) doc/reference/libtelepathy-logger/tmpl/entity-internal.sgml (+0/-24) doc/reference/libtelepathy-logger/tmpl/entity.sgml (+0/-133) doc/reference/libtelepathy-logger/tmpl/event.sgml (+0/-127) doc/reference/libtelepathy-logger/tmpl/log-manager.sgml (+0/-234) doc/reference/libtelepathy-logger/tmpl/log-store-pidgin-internal.sgml (+0/-30) doc/reference/libtelepathy-logger/tmpl/streamed-media-channel-internal.sgml (+0/-61) doc/reference/libtelepathy-logger/tmpl/text-event.sgml (+0/-121) |
| To merge this branch: | bzr merge lp://qastaging/~darkxst/ubuntu/quantal/telepathy-logger/lp1049210 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu branches | Pending | ||
|
Review via email:
|
|||
To post a comment you must log in.
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
