]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
authorJohn Mandereau <john.mandereau@gmail.com>
Sat, 25 Jul 2009 19:18:51 +0000 (21:18 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Sat, 25 Jul 2009 19:18:51 +0000 (21:18 +0200)
commit1c859650b6ff11a7dbe829328fd5cae3816b9231
treed20198e3918d95233d1b49dacb747ea0c2dcb6f1
parent3d8089a42af6304edb8dad56220e845c84832bb2
parentd31248d7770fb5770c2caacfb3547984bf8dcdc3
Merge branch 'lilypond/translation' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

Conflicts:
Documentation/fr/learning/introduction.itely
Documentation/fr/learning/tutorial.itely
Documentation/fr/learning/tweaks.itely
Documentation/fr/learning/working.itely
input/texidocs/chord-name-major7.texidoc
input/texidocs/chordchanges-for-fretboards.texidoc
input/texidocs/making-slurs-with-complex-dash-structure.texidoc
input/texidocs/non-default-tuplet-numbers.texidoc
input/texidocs/non-traditional-key-signatures.texidoc
18 files changed:
Documentation/es/learning/scheme-tutorial.itely
Documentation/es/learning/tweaks.itely
Documentation/es/macros.itexi
Documentation/es/notation/input.itely
Documentation/es/notation/notation-appendices.itely
Documentation/es/texidocs/chord-name-major7.texidoc
Documentation/es/texidocs/chordchanges-for-fretboards.texidoc
Documentation/es/texidocs/making-slurs-with-complex-dash-structure.texidoc
Documentation/es/texidocs/non-default-tuplet-numbers.texidoc
Documentation/es/texidocs/non-traditional-key-signatures.texidoc
Documentation/fr/learning/introduction.itely
Documentation/fr/learning/tutorial.itely
Documentation/fr/learning/tweaks.itely
Documentation/fr/learning/working.itely
Documentation/snippets/chordchanges-for-fretboards.ly
Documentation/snippets/making-slurs-with-complex-dash-structure.ly
Documentation/snippets/non-default-tuplet-numbers.ly
Documentation/snippets/non-traditional-key-signatures.ly