]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond
authorJohn Mandereau <john.mandereau@gmail.com>
Sat, 25 Jul 2009 18:56:25 +0000 (20:56 +0200)
committerJohn Mandereau <john.mandereau@gmail.com>
Sat, 25 Jul 2009 18:56:25 +0000 (20:56 +0200)
commit3d8089a42af6304edb8dad56220e845c84832bb2
treeaeffb39ae399a2639e2e36756f758181ef2ae615
parent69f0ec479a6ade46d0a227755bb02562112c6743
parent3eb1e37e2e0b3966142cd04b85e30ab882308612
Merge branch 'master' of ssh://jomand@git.sv.gnu.org/srv/git/lilypond

Conflicts:
Documentation/user/music-glossary.tely
Documentation/music-glossary.tely
Documentation/notation/expressive.itely
Documentation/notation/text.itely
scm/documentation-generate.scm