Merge remote-tracking branch 'origin/translation'

[lilypond.git] / lily / include / audio-staff.hh

diff --git a/lily/include/audio-staff.hh b/lily/include/audio-staff.hh
index acf31b17a4808d0dbfa5ae921e12508ea0353ddb..ca1fdb9b5c368309ea1a5aaeff53afd5de57411f 100644 (file)
--- a/lily/include/audio-staff.hh
+++ b/lily/include/audio-staff.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1996--2011 Jan Nieuwenhuizen <janneke@gnu.org>
+  Copyright (C) 1996--2014 Jan Nieuwenhuizen <janneke@gnu.org>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -30,9 +30,10 @@ struct Audio_staff : public Audio_element
   void output (Midi_stream &midi_stream_r, int track, bool port);
 
   Audio_staff ();
-  
+
   bool percussion_;
-  vector<Audio_item*> audio_items_;
+  bool merge_unisons_;
+  vector<Audio_item *> audio_items_;
 };
 
 #endif // AUDIO_STAFF_HH