Merge remote branch 'origin/master' into release/unstable

[lilypond.git] / lily / midi-control-function-performer.cc

diff --git a/lily/midi-control-function-performer.cc b/lily/midi-control-function-performer.cc
index 4269baf7e26c97f1b9b26d3e80a34de98317c581..0a02668c305a724f787095e2ba9ce8639a52c471 100644 (file)
--- a/lily/midi-control-function-performer.cc
+++ b/lily/midi-control-function-performer.cc
@@ -1,9 +1,9 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 2013--2014 by Heikki Tauriainen <g034737@welho.com>.
+  Copyright (C) 2013--2015 by Heikki Tauriainen <g034737@welho.com>.
   Adapted from performer implementations
-  Copyright (C) 1996--2014 Jan Nieuwenhuizen <janneke@gnu.org>,
+  Copyright (C) 1996--2015 Jan Nieuwenhuizen <janneke@gnu.org>,
   Han-Wen Nienhyus <hanwen@xs4all.nl> and others.
 
   LilyPond is free software: you can redistribute it and/or modify
@@ -125,6 +125,7 @@ ADD_TRANSLATOR (Midi_control_function_performer,
                 /* read */
                 "midiBalance "
                 "midiPanPosition "
+                "midiExpression "
                 "midiReverbLevel "
                 "midiChorusLevel ",