~alan-griffiths/mir/fix-1654023

« back to all changes in this revision

Viewing changes to src/server/compositor/default_configuration.cpp

  • Committer: Daniel van Vugt
  • Date: 2015-04-28 07:54:10 UTC
  • mfrom: (2517 development-branch)
  • mto: This revision was merged to the branch mainline in revision 2673.
  • Revision ID: daniel.van.vugt@canonical.com-20150428075410-rwskshfuar7voesp
Merge latest trunk and fix conflicts.

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
 
19
19
#include "mir/default_server_configuration.h"
20
20
 
 
21
#include "mir/shell/shell.h"
21
22
#include "buffer_stream_factory.h"
22
23
#include "default_display_buffer_compositor_factory.h"
23
24
#include "multi_threaded_compositor.h"
85
86
                the_display(),
86
87
                the_scene(),
87
88
                the_display_buffer_compositor_factory(),
 
89
                the_shell(),
88
90
                the_compositor_report(),
89
91
                !the_options()->is_set(options::host_socket_opt));
90
92
        });