]> git.donarmstrong.com Git - lilypond.git/commit
Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond
authorJoe Neeman <joeneeman@gmail.com>
Thu, 21 Dec 2006 17:36:26 +0000 (19:36 +0200)
committerJoe Neeman <joeneeman@gmail.com>
Thu, 21 Dec 2006 17:36:26 +0000 (19:36 +0200)
commitc14ca81399bf3357ad0d936106797bce356b561a
treeb2a15c761cdb50e19715ff456e2c2073a8469ca9
parent42c5103a716d4d94ccb1c71378d1d7cb197844a4
parent3089416af2cb8f0c4dac3fe2b58e10744100403f
Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

Conflicts:

lily/align-interface.cc
lily/align-interface.cc