From: John Mandereau <john.mandereau@gmail.com>
Date: Tue, 8 Jul 2008 14:48:55 +0000 (+0200)
Subject: Merge branch 'master' of /home/lilydev/git/lily/
X-Git-Tag: release/2.11.52-1~12^2
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=64f5ca386a49cbad53d498728db9ad57772e04c8;p=lilypond.git

Merge branch 'master' of /home/lilydev/git/lily/

* 'master' of /home/lilydev/git/lily/:
  GDP NR 3.5 Typos
  First update from Joseph.
  Update from Kurt.
  Use string-port for graphviz test, redirecting output through
  Fix for smobs.hh
  Rerun convert-ly on translations.

Conflicts:

	Documentation/de/user/expressive.itely
	Documentation/es/user/expressive.itely
	Documentation/fr/user/expressive.itely
---

64f5ca386a49cbad53d498728db9ad57772e04c8
diff --cc Documentation/es/user/expressive.itely
index db2495787a,fdf3fa1979..53e56f219a
--- a/Documentation/es/user/expressive.itely
+++ b/Documentation/es/user/expressive.itely
@@@ -241,10 -241,11 +241,10 @@@ c2 b4 a g1\espressiv
  Los @notation{Crescendi} y @notation{decrescendi} se pueden
  tipografiar como marcas textuales en lugar de reguladores.  Las
  instrucciones incorporadaas que activan estos modos de texto son
- @code{\crescTextCresc}, @code{\dimTextDecr}, @code{\dimTextDecresc} y
+ @code{\crescTextCresc}, @code{\dimTextDecresc}, @code{\dimTextDecr} y
  @code{\dimTextDim}.  Las instrucciones correspondientes
 -@code{\crescHairpin}, @code{\setHairpinDim} y
 -@code{\dimHairpin} hacen que vuelvan a aparecer los reguladores
 -de nuevo:
 +@code{\crescHairpin} y @code{\dimHairpin} hacen que vuelvan a aparecer
 +los reguladores de nuevo:
  
  @lilypond[verbatim,quote,relative=2]
  c\< d e f\!