Merge lp://qastaging/~gue5t/midori/builtInIcons2 into lp://qastaging/~midori/midori/builtInIcons
Proposed by
gue5t gue5t
| Status: | Merged |
|---|---|
| Merged at revision: | 7026 |
| Proposed branch: | lp://qastaging/~gue5t/midori/builtInIcons2 |
| Merge into: | lp://qastaging/~midori/midori/builtInIcons |
| Diff against target: |
45 lines (+6/-5) 2 files modified
icons/CMakeLists.txt (+4/-0) katze/midori-paths.vala (+2/-5) |
| To merge this branch: | bzr merge lp://qastaging/~gue5t/midori/builtInIcons2 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Cris Dywan | Pending | ||
|
Review via email:
|
|||
Commit message
simplify path handing and make a symlink at build-time to show adblock icons without install
Description of the change
I think this fulfills the required directory layout. Hopefully it's okay to invoke `ln`; as far as I could tell CMake doesn't have a built-in symlink command, but this works on any POSIX system (and isn't run on Windows).
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
