Unity 8

Code review comment for lp://qastaging/~dandrader/unity8/availableDesktopArea

  1. availableDesktopArea
  2. Merge into trunk
Revision history for this message
Daniel d'Andrada (dandrader) wrote :

On 24/03/2017 05:22, Albert Astals Cid wrote:
> Text conflict in plugins/WindowManager/CMakeLists.txt
> Text conflict in qml/Stage/DecoratedWindow.qml
> Text conflict in qml/Stage/Stage.qml
> 3 conflicts encountered.

fixed

« Back to merge proposal