Merge lp://qastaging/~compiz-team/compiz/compiz.revert_3353 into lp://qastaging/compiz/0.9.8
Proposed by
Sam Spilsbury
| Status: | Merged |
|---|---|
| Approved by: | Daniel van Vugt |
| Approved revision: | 3355 |
| Merged at revision: | 3357 |
| Proposed branch: | lp://qastaging/~compiz-team/compiz/compiz.revert_3353 |
| Merge into: | lp://qastaging/compiz/0.9.8 |
| Diff against target: |
3976 lines (+618/-2444) 30 files modified
compizconfig/gsettings/gsettings_backend_shared/gsettings_util.c (+1/-1) compizconfig/gsettings/tests/test_gsettings_conformance.cpp (+1/-3) compizconfig/libcompizconfig/include/ccs-defs.h (+0/-3) compizconfig/libcompizconfig/include/ccs.h (+25/-32) compizconfig/libcompizconfig/src/CMakeLists.txt (+0/-16) compizconfig/libcompizconfig/src/ccs-private.h (+3/-0) compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.c (+10/-241) compizconfig/libcompizconfig/src/ccs_settings_upgrade_internal.h (+0/-12) compizconfig/libcompizconfig/src/ccs_text_file.c (+0/-212) compizconfig/libcompizconfig/src/ccs_text_file.h (+0/-49) compizconfig/libcompizconfig/src/ccs_text_file_interface.c (+0/-50) compizconfig/libcompizconfig/src/ccs_text_file_interface.h (+0/-67) compizconfig/libcompizconfig/src/main.c (+265/-131) compizconfig/libcompizconfig/tests/CMakeLists.txt (+1/-20) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_mock_backend_conformance.cpp (+18/-21) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_settings_upgrade_internal.cpp (+12/-725) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_text_file.cpp (+0/-49) compizconfig/mocks/libcompizconfig/CMakeLists.txt (+0/-11) compizconfig/mocks/libcompizconfig/compizconfig_ccs_context_mock.h (+3/-3) compizconfig/mocks/libcompizconfig/compizconfig_ccs_plugin_mock.h (+15/-15) compizconfig/mocks/libcompizconfig/compizconfig_ccs_setting_mock.h (+18/-18) compizconfig/mocks/libcompizconfig/compizconfig_ccs_text_file_mock.cpp (+0/-104) compizconfig/mocks/libcompizconfig/compizconfig_ccs_text_file_mock.h (+0/-84) compizconfig/tests/compizconfig_backend_concept_test.h (+246/-49) compizconfig/tests/compizconfig_ccs_item_in_list_matcher.h (+0/-106) compizconfig/tests/compizconfig_ccs_list_equality.h (+0/-74) compizconfig/tests/compizconfig_ccs_list_wrapper.h (+0/-199) compizconfig/tests/compizconfig_ccs_mocked_allocator.h (+0/-22) compizconfig/tests/compizconfig_ccs_setting_value_operators.h (+0/-105) compizconfig/tests/compizconfig_test_value_combiners.h (+0/-22) |
| To merge this branch: | bzr merge lp://qastaging/~compiz-team/compiz/compiz.revert_3353 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Daniel van Vugt | Approve | ||
| jenkins (community) | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
Revert r3353 as it was unreviewed and somehow got merged
Description of the change
Revert r3353 as it was unreviewed and somehow got merged
To post a comment you must log in.
Revision history for this message
| jenkins (martin-mrazik+qa) wrote | # |
review:
Approve
(continuous-integration)
Revision history for this message
| Daniel van Vugt (vanvugt) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
PASSED: Continuous integration, rev:3355
http://
Executed test runs:
SUCCESS: http://