Unity

Code review comment for lp://qastaging/~unity-team/unity/fixes.unityshell-overlay

  1. fixes.unityshell-overlay
  2. Merge into trunk
Revision history for this message
Unity Merger (unity-merger) wrote :

Attempt to merge into lp:unity failed due to conflicts:

text conflict in plugins/unityshell/src/unityshell.cpp
text conflict in tests/autopilot/autopilot/emulators/unity/hud.py
text conflict in tests/autopilot/autopilot/tests/test_hud.py

« Back to merge proposal