Merge lp://qastaging/~muktupavels/compiz/config into lp://qastaging/compiz/0.9.13
Proposed by
Alberts Muktupāvels
| Status: | Merged |
|---|---|
| Approved by: | Dmitry Shachnev |
| Approved revision: | 4210 |
| Merged at revision: | 4209 |
| Proposed branch: | lp://qastaging/~muktupavels/compiz/config |
| Merge into: | lp://qastaging/compiz/0.9.13 |
| Diff against target: |
441 lines (+150/-120) 15 files modified
cmake/CompizCommon.cmake (+0/-17) compizconfig/CMakeLists.txt (+3/-0) compizconfig/libcompizconfig/config/CMakeLists.txt (+2/-8) compizconfig/libcompizconfig/config/config (+0/-8) compizconfig/libcompizconfig/config/config.conf (+27/-0) compizconfig/libcompizconfig/libcompizconfig.pc.in (+3/-1) compizconfig/libcompizconfig/src/CMakeLists.txt (+2/-2) compizconfig/libcompizconfig/src/ccs_config_file.c (+105/-47) compizconfig/libcompizconfig/src/main.c (+2/-2) compizconfig/libcompizconfig/tests/CMakeLists.txt (+1/-1) compizconfig/libcompizconfig/tests/compizconfig_test_ccs_context.cpp (+3/-3) debian/compizconfig (+0/-27) debian/libcompizconfig0.install (+1/-1) debian/libcompizconfig0.maintscript (+1/-0) debian/rules (+0/-3) |
| To merge this branch: | bzr merge lp://qastaging/~muktupavels/compiz/config |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Dmitry Shachnev | Approve | ||
| Marco Trevisan (Treviño) | Pending | ||
| Khurshid Alam | Pending | ||
|
Review via email:
|
|||
Commit message
Add support for loading configuration from multiple files.
Description of the change
Add support for loading configuration from multiple files.
This is needed to allow external / other projects provide their own configuration without adding them to compiz. This is preparation to move unity config and upgrade files to unity.
To post a comment you must log in.
Revision history for this message
| Dmitry Shachnev (mitya57) | # |
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
