git.donarmstrong.com Git - lilypond.git/commit

]> git.donarmstrong.com Git - lilypond.git/commit

projects / lilypond.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: e3bd073 49c5e7b)

author	Joe Neeman <joeneeman@gmail.com>
	Wed, 31 Jan 2007 07:38:46 +0000 (09:38 +0200)
committer	Joe Neeman <joeneeman@gmail.com>
	Wed, 31 Jan 2007 07:38:46 +0000 (09:38 +0200)
commit	e9a308e9c6002900fc336733950a0175bcbcc333
tree	ab29a8ed9abb0bb2dbb3cc3108fd98adada70410	tree \| snapshot
parent	e3bd073b603167e110d3ecac4bfa3e1ca75e0106	commit \| diff
parent	49c5e7ba9c44a60281f45a802a77e006570c7ac0	commit \| diff

Merge branch 'master' of git+ssh://jneem@git.sv.gnu.org/srv/git/lilypond

Conflicts:

lily/text-spanner-engraver.cc

13 files changed:

lily/align-interface.cc	diff1 \|	diff2 \|	blob \| history
lily/bar-number-engraver.cc	diff1 \|	diff2 \|	blob \| history
lily/beam.cc	diff1 \|	diff2 \|	blob \| history
lily/grob.cc	diff1 \|	diff2 \|	blob \| history
lily/paper-score.cc	diff1 \|	diff2 \|	blob \| history
lily/prob-scheme.cc	diff1 \|	diff2 \|	blob \| history
lily/slur.cc	diff1 \|	diff2 \|	blob \| history
lily/stem.cc	diff1 \|	diff2 \|	blob \| history
lily/text-spanner-engraver.cc	diff1 \|	diff2 \|	blob \| history
lily/trill-spanner-engraver.cc	diff1 \|	diff2 \|	blob \| history
ly/engraver-init.ly	diff1 \|	diff2 \|	blob \| history
scm/define-grob-properties.scm	diff1 \|	diff2 \|	blob \| history
scm/define-grobs.scm	diff1 \|	diff2 \|	blob \| history

Debian packaging of lilypond