Unity 8

Code review comment for lp:~macslow/unity8/shellRotation

  1. shellRotation
  2. Merge into trunk
Revision history for this message
Mirco Müller (macslow) wrote :

> Text conflict in qml/Stages/PhoneStage.qml
> Text conflict in qml/Stages/TabletStage.qml
That's coming from ~unity-team/unity8/shellRotation merged with unity8 trunk. I'll wait for Daniel to sort that out there.

> Text conflict in tests/autopilot/unity8/fixture_setup.py
Fixing that one now.

« Back to merge proposal