Merge lp://staging/~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 into lp://staging/compiz-compizconfig-gsettings
Proposed by
Sam Spilsbury
| Status: | Work in progress | ||||
|---|---|---|---|---|---|
| Proposed branch: | lp://staging/~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 | ||||
| Merge into: | lp://staging/compiz-compizconfig-gsettings | ||||
| Prerequisite: | lp://staging/~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_872976 | ||||
| Diff against target: |
160 lines (+17/-17) 2 files modified
src/gconf-integration.c (+7/-7) src/gsettings.c (+10/-10) |
||||
| To merge this branch: | bzr merge lp://staging/~compiz-team/compiz-compizconfig-gsettings/compiz-compizconfig-gsettings.fix_874815 | ||||
| Related bugs: |
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Sam Spilsbury | Pending | ||
|
Review via email:
|
|||
This proposal supersedes a proposal from 2011-10-15.
Description of the change
To post a comment you must log in.
Unmerged revisions
- 161. By Sam Spilsbury
-
More descriptive names
- 160. By Sam Spilsbury
-
Merge in changes from truncation branch
- 159. By Sam Spilsbury
-
Fix conflicts
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
