Merge lp://qastaging/~gordallott/unity/unity-structure-refactor into lp://qastaging/unity
Proposed by
Gord Allott
Status: | Merged |
---|---|
Approved by: | Gord Allott |
Approved revision: | no longer in the source branch. |
Merged at revision: | 2353 |
Proposed branch: | lp://qastaging/~gordallott/unity/unity-structure-refactor |
Merge into: | lp://qastaging/unity |
Diff against target: |
24 lines (+3/-0) 2 files modified
dash/CMakeLists.txt (+1/-0) shortcuts/CMakeLists.txt (+2/-0) |
To merge this branch: | bzr merge lp://qastaging/~gordallott/unity/unity-structure-refactor |
Related bugs: |
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Łukasz Zemczak | Approve | ||
Unity Team | Pending | ||
Review via email:
|
Commit message
fixes runtime segfault in trunk
Description of the change
a few files wern't included in the build system causing the unityshell so to fail, fixes that
To post a comment you must log in.
Now the compiled trunk works correctly, no segfaults on startup anymore.