Merge lp://qastaging/~compiz-team/compiz/compiz.pull_mocks_into_compizconfig_dir into lp://qastaging/compiz/0.9.8
Proposed by
Sam Spilsbury
| Status: | Superseded |
|---|---|
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.pull_mocks_into_compizconfig_dir |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Prerequisite: | lp://qastaging/~compiz-team/compiz/compiz.ccs_mocks_memmgmt |
| Diff against target: |
352 lines (+117/-100) 12 files modified
compizconfig/CMakeLists.txt (+4/-0) compizconfig/gsettings/tests/CMakeLists.txt (+3/-2) compizconfig/gsettings/tests/gsettings_mocks.h (+1/-1) compizconfig/libcompizconfig/tests/CMakeLists.txt (+60/-91) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp (+1/-1) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_plugin.cpp (+1/-1) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_setting.cpp (+1/-1) compizconfig/mocks/CMakeLists.txt (+1/-0) compizconfig/mocks/libcompizconfig/CMakeLists.txt (+42/-0) compizconfig/mocks/libcompizconfig/compizconfig_ccs_context_mock.cpp (+1/-1) compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.cpp (+1/-1) compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.cpp (+1/-1) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.pull_mocks_into_compizconfig_dir |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Compiz Maintainers | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2012-07-11.
Description of the change
Pulls the mocks into compizconfig/
To post a comment you must log in.
Unmerged revisions
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
