Merge lp://qastaging/~timo-jyrinki/bamf/0.3-revertrevert into lp://qastaging/bamf/0.3
Proposed by
Timo Jyrinki
| Status: | Merged |
|---|---|
| Approved by: | Łukasz Zemczak |
| Approved revision: | 495 |
| Merged at revision: | 495 |
| Proposed branch: | lp://qastaging/~timo-jyrinki/bamf/0.3-revertrevert |
| Merge into: | lp://qastaging/bamf/0.3 |
| Diff against target: |
630 lines (+171/-76) 13 files modified
config.h.in (+3/-0) configure.in (+11/-2) lib/libbamf/Makefile.am (+37/-24) lib/libbamf/bamf-application.c (+12/-0) lib/libbamf/bamf-control.c (+5/-0) lib/libbamf/bamf-matcher.c (+5/-5) lib/libbamf/bamf-tab-source.c (+13/-0) lib/libbamf/bamf-view.c (+4/-3) lib/libbamf/bamf-view.h (+1/-1) lib/libbamf/bamf-window.c (+1/-1) src/Makefile.am (+35/-26) src/bamf-matcher.c (+6/-0) tests/bamfdaemon/Makefile.am (+38/-14) |
| To merge this branch: | bzr merge lp://qastaging/~timo-jyrinki/bamf/0.3-revertrevert |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Łukasz Zemczak | Approve | ||
|
Review via email:
|
|||
Commit message
Revert the revert in r494, cleanups were not rejected after all.
Description of the change
Revert the revert in r494, cleanups were not rejected after all.
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
Just one comment here: :D
Confusing, but that's the right way to go ;)