]> git.donarmstrong.com Git - lilypond.git/commit - input/lsr/compound-time-signatures.ly
Resolve conflict
authorFrancisco Vila <francisco.vila@hispalinux.es>
Fri, 3 Oct 2008 18:12:41 +0000 (20:12 +0200)
committerFrancisco Vila <francisco.vila@hispalinux.es>
Fri, 3 Oct 2008 18:12:41 +0000 (20:12 +0200)
commit03aeb8ec429f88b99aa00e7ad44b593e94737760
tree504c59b3aba7a2ca9893dc4363c37d231e589320
parentfdbe886ca7600b787ebbc9a4e688530047f8a5a0
parentdf085c0401f82b9fd3a454916d4c95aa7759e2fc
Resolve conflict
Documentation/es/index.html.in
Documentation/es/user/rhythms.itely
Documentation/es/user/staff.itely
Documentation/es/user/text.itely