Unity 8

Code review comment for lp:~nick-dedekind/unity8/side-stage-redesign

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

"""
Text conflict in CMakeLists.txt
Text conflict in debian/control
Text conflict in qml/Stages/ApplicationWindow.qml
Text conflict in tests/mocks/Unity/Application/MirSurfaceItem.h
"""

A bunch of conflicts with latest trunk now.

review: Needs Fixing

« Back to merge proposal