]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman
authorJoe Neeman <joeneeman@gmail.com>
Sun, 4 Feb 2007 09:22:35 +0000 (11:22 +0200)
committerJoe Neeman <joeneeman@gmail.com>
Sun, 4 Feb 2007 09:22:35 +0000 (11:22 +0200)
commita3765e1d290e5e49093e7ca7791bf3fe20be1726
tree29c997b0a387d5034f0a3635ebc0d4ec7d7d15c9
parentd82a44e5ca6da31e5fc98099e64c29b4e060a8f7
parent947b9d81b8e09868b3d7bf5293d9a2f6ffa251ed
Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond into jneeman

Conflicts:

lily/grob-property.cc
lily/axis-group-interface.cc
lily/context.cc
lily/grob-property.cc
lily/include/context.hh
lily/include/grob.hh
lily/main.cc
scm/lily.scm