]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'lilypond/translation' into staging
authorFrancisco Vila <francisco.vila@hispalinux.es>
Wed, 7 Mar 2012 09:23:11 +0000 (10:23 +0100)
committerFrancisco Vila <francisco.vila@hispalinux.es>
Wed, 7 Mar 2012 09:23:11 +0000 (10:23 +0100)
commit9d1520b21710bd22872010ae9aa4c4899014e9d4
tree04b303067cae8d52854ad029cbded64bc7403ce6
parent744709d5ce7c67890c5c79f359f885a09cc26f27
parentab45be2f0dd1b5eece042934682039ec4e99b271
Merge branch 'lilypond/translation' into staging

Conflicts:
Documentation/changes.tely
Documentation/translations.itexi
Documentation/web/news-front.itexi
VERSION
input/regression/layout-from.ly
lily/context-def.cc
Documentation/translations.itexi
Documentation/web/community.itexi
lily/book-scheme.cc
lily/parser.yy
ly/engraver-init.ly
ly/music-functions-init.ly
scm/lily-library.scm