diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-08-05 14:22:32 -0400 |
commit | 616f2a0370a10dcc7372a95f6bca9f5a45698980 (patch) | |
tree | b07badccad237cc66d0668482ad65cedefdee23f /libs/ardour/ardour/panner_shell.h | |
parent | 499b7fcfa9f3e8535a4500143a9d7af7b67c6984 (diff) | |
parent | 38e4f7bd1ba2ec9ae37dbb384da449f894cd8564 (diff) |
fix conflicts after merge with master
Diffstat (limited to 'libs/ardour/ardour/panner_shell.h')
-rw-r--r-- | libs/ardour/ardour/panner_shell.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h index 7d24adb46f..dba5826370 100644 --- a/libs/ardour/ardour/panner_shell.h +++ b/libs/ardour/ardour/panner_shell.h @@ -53,7 +53,7 @@ public: std::string describe_parameter (Evoral::Parameter param); - bool can_support_io_configuration (const ChanCount& /*in*/, ChanCount& /*out*/) const { return true; }; + bool can_support_io_configuration (const ChanCount& /*in*/, ChanCount& /*out*/) { return true; }; void configure_io (ChanCount in, ChanCount out); /// The fundamental Panner function |