Unity 8

Code review comment for lp:~nick-dedekind/unity8/menu.overflow

  1. menu.overflow
  2. Merge into trunk
Revision history for this message
Nick Dedekind (nick-dedekind) wrote :

> Text conflict in plugins/Utils/CMakeLists.txt
> Text conflict in plugins/Utils/plugin.cpp
> Text conflict in tests/mocks/Utils/CMakeLists.txt
> Text conflict in tests/mocks/Utils/plugin.cpp
> Text conflict in tests/qmltests/ApplicationMenus/tst_MenuBar.qml
> 5 conflicts encountered.

merged

« Back to merge proposal