unity-2d

Code review comment for lp:~uriboni/unity-2d/launcher-keyboard-shortcuts

  1. launcher-keyboard-shortcuts
  2. Merge into natty
Revision history for this message
Florian Boucault (fboucault) wrote :

Attempt to merge into lp:unity-2d failed due to conflicts:

text conflict in launcher/LauncherItem.qml
text conflict in launcher/app/CMakeLists.txt
text conflict in libunity-2d-private/src/CMakeLists.txt
text conflict in places/app/places.cpp

« Back to merge proposal