Merge lp:~codeforger/simplegc/label into lp:simplegc
Proposed by
Michael Rochester
Status: | Merged |
---|---|
Approved by: | Sam Bull |
Approved revision: | 209 |
Merged at revision: | 216 |
Proposed branch: | lp:~codeforger/simplegc/label |
Merge into: | lp:simplegc |
Diff against target: |
227 lines (+126/-44) (has conflicts) 2 files modified
sgc/example/test.py (+9/-2) sgc/widgets/label.py (+117/-42) Text conflict in sgc/example/test.py |
To merge this branch: | bzr merge lp:~codeforger/simplegc/label |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Sam Bull | Approve | ||
Review via email: mp+100381@code.launchpad.net |
Description of the change
NOt an up to date branch, I couldent work out how )':
To post a comment you must log in.