Unity

Merge lp://qastaging/~jaytaoko/unity/unity-linaro-merge into lp://qastaging/unity

  1. unity-linaro-merge
  2. Merge into trunk
Proposed by Jay Taoko
Status: Work in progress
Proposed branch: lp://qastaging/~jaytaoko/unity/unity-linaro-merge
Merge into: lp://qastaging/unity
Diff against target: 961 lines (+269/-148) (has conflicts)
9 files modified
CMakeLists.txt (+4/-0)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.cpp (+18/-20)
plugins/unity-mt-grab-handles/src/unity-mt-grab-handles.h (+1/-1)
plugins/unitydialog/src/unitydialog.cpp (+54/-50)
plugins/unitydialog/src/unitydialog.h (+12/-7)
plugins/unityshell/src/IconRenderer.cpp (+24/-9)
plugins/unityshell/src/unityshell.cpp (+143/-58)
plugins/unityshell/src/unityshell.h (+12/-3)
tests/CMakeLists.txt (+1/-0)
Text conflict in plugins/unityshell/src/unityshell.cpp
Text conflict in plugins/unityshell/src/unityshell.h
To merge this branch: bzr merge lp://qastaging/~jaytaoko/unity/unity-linaro-merge
Reviewer Review Type Date Requested Status
Unity Team Pending
Review via email: mp+87926@code.qastaging.launchpad.net

Description of the change

Test the difference with Unity trunk

To post a comment you must log in.

Unmerged revisions

1814. By Jay Taoko

* Merge Linaro's Unity branch with Unity trunk. This branch as the effect of porting the Linaro's branch to Unity 5.0.
* This branch needs Linaro's version of Compiz to build.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.