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

[lilypond.git] / lily / include / music-output.hh

diff --git a/lily/include/music-output.hh b/lily/include/music-output.hh
index b9f99f2221318f87e5865b3df1c074fb08e8897e..37437fbcac98f6f627f9b156cb15038a1a667448 100644 (file)
--- a/lily/include/music-output.hh
+++ b/lily/include/music-output.hh
@@ -1,7 +1,7 @@
 /*
   This file is part of LilyPond, the GNU music typesetter.
 
-  Copyright (C) 1997--2014 Han-Wen Nienhuys <hanwen@xs4all.nl>
+  Copyright (C) 1997--2015 Han-Wen Nienhuys <hanwen@xs4all.nl>
 
   LilyPond is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -29,7 +29,7 @@
 class Music_output : public Smob<Music_output>
 {
 public:
-  static int print_smob (SCM, SCM, scm_print_state *);
+  int print_smob (SCM, scm_print_state *);
   SCM mark_smob ();
   static const char type_p_name_[];
   virtual ~Music_output ();