]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'lilypond/translation' of /home/jcharles/GIT/Lily/.
authorJean-Charles Malahieude <lilyfan@orange.fr>
Tue, 16 Nov 2010 18:52:56 +0000 (19:52 +0100)
committerJean-Charles Malahieude <lilyfan@orange.fr>
Tue, 16 Nov 2010 18:52:56 +0000 (19:52 +0100)
commit3bbcacb6ab56baec5f28fa2e17d575994ab90484
tree65d22899c5b6d82cb06cddbb84029561e376f430
parent25233e40ae1a31b50f949a1d6b4146d01ac9350a
parent411485a9d27fc8161de0e14ae7908f3fe45964d9
Merge branch 'lilypond/translation' of /home/jcharles/GIT/Lily/.

Conflicts:
Documentation/de/essay/engraving.itely (version number)
Documentation/de/learning/fundamental.itely (version number)
Documentation/fr/notation/spacing.itely (messy)
Documentation/de/essay/engraving.itely
Documentation/de/notation/spacing.itely
Documentation/es/notation/spacing.itely
Documentation/fr/essay/engraving.itely
Documentation/fr/notation/spacing.itely