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: 48ed0e4 dbe08fc)

author	Joe Neeman <joeneeman@gmail.com>
	Thu, 25 Jan 2007 19:10:29 +0000 (21:10 +0200)
committer	Joe Neeman <joeneeman@gmail.com>
	Thu, 25 Jan 2007 19:10:29 +0000 (21:10 +0200)
commit	2819ba86363def7f615b7fbbf03aecef761296c6
tree	a849315eb953f1f4044de2aa5d3393044139cc3a	tree \| snapshot
parent	48ed0e44eb2e6108d615154961f3662c25b85d88	commit \| diff
parent	dbe08fc4b061ff2badbe7c87bbd53527b13a2c7c	commit \| diff

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

Conflicts:

lily/page-breaking.cc

lily/constrained-breaking.cc	diff1 \|	diff2 \|	blob \| history
lily/dynamic-engraver.cc	diff1 \|	diff2 \|	blob \| history
lily/grob.cc	diff1 \|	diff2 \|	blob \| history
lily/include/grob.hh	diff1 \|	diff2 \|	blob \| history
lily/page-breaking.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