Merge lp://staging/~mhr3/nux/merge-trunk-r787 into lp://staging/~unity-team/nux/smart-scopes
Proposed by
Michal Hruby
| Status: | Merged |
|---|---|
| Approved by: | Nick Dedekind |
| Approved revision: | 787 |
| Merged at revision: | 787 |
| Proposed branch: | lp://staging/~mhr3/nux/merge-trunk-r787 |
| Merge into: | lp://staging/~unity-team/nux/smart-scopes |
| Diff against target: |
290 lines (+124/-44) 10 files modified
Nux/Makefile.am (+1/-0) Nux/TextEntry.cpp (+31/-15) Nux/TextEntry.h (+31/-17) NuxCore/Makefile.am (+1/-0) data/Makefile.am (+1/-1) debian/changelog (+22/-0) debian/copyright (+32/-6) examples/Makefile.am (+1/-1) gputests/Makefile.am (+1/-2) tests/Makefile.am (+3/-2) |
| To merge this branch: | bzr merge lp://staging/~mhr3/nux/merge-trunk-r787 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| PS Jenkins bot (community) | continuous-integration | Approve | |
| Nick Dedekind (community) | Approve | ||
|
Review via email:
|
|||
Commit message
Merge lp:nux trunk
Description of the change
Merge lp:nux trunk
To post a comment you must log in.
Revision history for this message
| PS Jenkins bot (ps-jenkins) | # |
review:
Approve
(continuous-integration)
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
LGTM