Unity 8

Code review comment for lp:~mzanetti/unity8/right-edge-2

  1. right-edge-2
  2. Merge into trunk
Revision history for this message
Michael Zanetti (mzanetti) wrote :

> Doesn't merge with current unity8 trunk
> Text conflict in plugins/Utils/plugin.cpp
> Text conflict in qml/Shell.qml
> 2 conflicts encountered.

fixed

« Back to merge proposal