Unity

Code review comment for lp:~smspillaz/unity/switcher_view_interface

  1. switcher_view_interface
  2. Merge into trunk
Revision history for this message
Brandon Schaefer (brandontschaefer) wrote :

Text conflict in launcher/SwitcherController.cpp
Text conflict in launcher/SwitcherController.h
Text conflict in launcher/SwitcherView.cpp
Text conflict in launcher/SwitcherView.h
Text conflict in plugins/unityshell/src/GesturalWindowSwitcher.cpp
Text conflict in plugins/unityshell/src/unityshell.cpp
Contents conflict in tests/StubSwitcherController.h
Text conflict in tests/test-gestures/sed_script_switcher
8 conflicts encountered.

:(

review: Needs Fixing

« Back to merge proposal