Merge lp://staging/~pete-woods/indicator-network/use-system-gmenuharness into lp://staging/indicator-network/15.10
Proposed by
Pete Woods
| Status: | Merged |
|---|---|
| Approved by: | Pete Woods |
| Approved revision: | 538 |
| Merged at revision: | 538 |
| Proposed branch: | lp://staging/~pete-woods/indicator-network/use-system-gmenuharness |
| Merge into: | lp://staging/indicator-network/15.10 |
| Diff against target: |
1884 lines (+40/-1677) 17 files modified
debian/control (+1/-0) tests/CMakeLists.txt (+16/-16) tests/integration/CMakeLists.txt (+2/-3) tests/integration/indicator-network-test-base.cpp (+2/-2) tests/integration/indicator-network-test-base.h (+16/-16) tests/integration/test-indicator-vpn.cpp (+1/-1) tests/integration/test-indicator.cpp (+1/-1) tests/menuharness/CMakeLists.txt (+0/-15) tests/menuharness/MatchResult.cpp (+0/-179) tests/menuharness/MatchResult.h (+0/-61) tests/menuharness/MatchUtils.cpp (+0/-72) tests/menuharness/MatchUtils.h (+0/-35) tests/menuharness/MenuItemMatcher.cpp (+0/-861) tests/menuharness/MenuItemMatcher.h (+0/-122) tests/menuharness/MenuMatcher.cpp (+0/-201) tests/menuharness/MenuMatcher.h (+0/-90) tests/unit/CMakeLists.txt (+1/-2) |
| To merge this branch: | bzr merge lp://staging/~pete-woods/indicator-network/use-system-gmenuharness |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Indicator Applet Developers | Pending | ||
|
Review via email:
|
|||
Commit message
Switch to using system-provided gmenuharness library (remove vendored menuharness from tree)
Description of the change
Switch to using system-provided gmenuharness library (remove vendored menuharness from tree)
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
