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

author	Graham Percival <graham@percival-music.ca>
	Thu, 10 Apr 2008 20:06:11 +0000 (13:06 -0700)
committer	Graham Percival <graham@percival-music.ca>
	Thu, 10 Apr 2008 20:06:11 +0000 (13:06 -0700)
commit	c24fb45cf071aeb818824e398ae7a3a77378d1d5
tree	71ee2479e8d479fe1dc374ee2447c68815712ea1	tree \| snapshot
parent	703bf9f756d270e1ea7bdf47eebe5f2fd2bcd4ee	commit \| diff
parent	c7bd2d7b701acb75adbfbcf3e89520a6801a02ec	commit \| diff

Resolve conflict, maybe?

Merge branch 'master' of git://git.sv.gnu.org/lilypond

Conflicts:

Documentation/user/text.itely