diff options
| author | David Robillard <d@drobilla.net> | 2016-10-01 19:53:04 -0400 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2016-10-01 19:53:04 -0400 |
| commit | f7bbd02b6bfdb3d09146488cfeebf26722abaa0c (patch) | |
| tree | 5429ce634eb5ffe5b83dbf83578f62db577c4a61 /src/server/events | |
| parent | 97bfcd3b24e7ae385cdec84363f9c868f580beb3 (diff) | |
| parent | c73c877f8bd09e0d5a6663ea5ba32a54465f5376 (diff) | |
| download | ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.tar.gz ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.tar.bz2 ingen-f7bbd02b6bfdb3d09146488cfeebf26722abaa0c.zip | |
Merge branch 'master' into parallel
Diffstat (limited to 'src/server/events')
| -rw-r--r-- | src/server/events/Mark.hpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/server/events/Mark.hpp b/src/server/events/Mark.hpp index f2c02b93..68ba5149 100644 --- a/src/server/events/Mark.hpp +++ b/src/server/events/Mark.hpp @@ -50,7 +50,7 @@ public: void execute(RunContext& context); void post_process(); - Execution get_execution() const override; + Execution get_execution() const; private: typedef std::map<GraphImpl*, CompiledGraph*> CompiledGraphs; |