From: Don Armstrong <don@donarmstrong.com>
Date: Wed, 29 Aug 2012 19:09:52 +0000 (-0700)
Subject: Merge tag 'upstream/2.16.0' into debian
X-Git-Tag: debian/2.16.0-1_exp+1~40
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=e48715dc917b0e1c8382dc47e2b5e193d3184000;p=lilypond.git

Merge tag 'upstream/2.16.0' into debian

Upstream version 2.16.0

Conflicts:
	Documentation/ja/web.texi
	lily/music-sequence.cc
	scm/lily.scm
---

e48715dc917b0e1c8382dc47e2b5e193d3184000
diff --cc lily/relocate.cc
index e5f38d1f90,0d600820ae..2f314f1063
--- a/lily/relocate.cc
+++ b/lily/relocate.cc
@@@ -21,13 -21,10 +21,12 @@@
  
  #include "config.hh"
  
- 
  /* TODO: autoconf support */
  
 +#include <ctype.h>
  #include <sys/types.h>
  #include <dirent.h>
 +#include <cstring>
  
  #if HAVE_GETTEXT
  #include <libintl.h>