Merge lp:~inkscape+alexander/inkscape/comments into lp:~inkscape.dev/inkscape/trunk
Proposed by
jazzynico
Status: | Merged | ||||
---|---|---|---|---|---|
Merged at revision: | 14986 | ||||
Proposed branch: | lp:~inkscape+alexander/inkscape/comments | ||||
Merge into: | lp:~inkscape.dev/inkscape/trunk | ||||
Diff against target: |
159 lines (+60/-3) (has conflicts) 3 files modified
src/document.cpp (+45/-1) src/document.h (+1/-1) src/sp-object.cpp (+14/-1) Text conflict in src/document.cpp |
||||
To merge this branch: | bzr merge lp:~inkscape+alexander/inkscape/comments | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
jazzynico (community) | Approve | ||
Review via email: mp+297150@code.launchpad.net |
To post a comment you must log in.
Conflicts fixed and comments merged rev. 14986.
Thanks Alexander!