← Back to branch summary

~robertcarr/mir/client-focus-notifications

~robertcarr/mir/client-focus-notifications

Viewing all changes in revision 764.

Committer: Robert Carr
Date: 2013-08-12 20:49:45 UTC
Revision ID: robert.carr@canonical.com-20130812204945-4bu40wed6wcsh6eu

Fix some merge errors

files modified:
src/server/shell/default_focus_mechanism.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/unit-tests/shell/test_default_focus_mechanism.cpp

Show diffs side-by-side

added added

removed removed

src/server/shell/default_focus_mechanism.cpp

tests/acceptance-tests/test_client_focus_notification.cpp

tests/acceptance-tests/test_shell_control_of_surface_configuration.cpp

tests/mir_test_framework/input_testing_server_options.cpp

tests/unit-tests/shell/test_default_focus_mechanism.cpp

Older »