← Back to branch summary

~mir-team/mir/attestable-timestamps

« back to all changes in this revision

Viewing changes to tests/mir_test_framework/stubbed_server_configuration.cpp

  • Committer: Daniel van Vugt
  • Date: 2014-03-06 06:05:17 UTC
  • mfrom: (1454 development-branch)
  • mto: This revision was merged to the branch mainline in revision 1463.
  • Revision ID: daniel.van.vugt@canonical.com-20140306060517-yhff25duwlo5otn1
Merge latest development-branch

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/mir_test_framework/stubbed_server_configuration.cpp
36
36
#include "mir_test_doubles/mock_android_native_buffer.h"
37
37
#endif
38
38
 
39
 
#include "src/server/compositor/renderer.h"
40
 
#include "src/server/compositor/renderer_factory.h"
 
39
#include "mir/compositor/renderer.h"
 
40
#include "mir/compositor/renderer_factory.h"
41
41
#include "src/server/input/null_input_configuration.h"
42
42
 
43
43
#include <boost/exception/errinfo_errno.hpp>