Merge commit 'origin' into beamlets2
commit4eb691cc9580529ec52018fa78a555375a3f8f17
authorJoe Neeman <joeneeman@gmail.com>
Wed, 31 Dec 2008 04:07:52 +0000 (31 15:07 +1100)
committerJoe Neeman <joeneeman@gmail.com>
Wed, 31 Dec 2008 04:07:52 +0000 (31 15:07 +1100)
tree32f6caa578fc23dc2c3784bb93c7161dc5c93ef4
parent24db67215111197eb1945b9782968a631a163966
parentd4170c7ea4615ddec1b7ad171a177790d0d80aa2
Merge commit 'origin' into beamlets2
lily/beam.cc
lily/stem.cc
scm/define-grob-properties.scm
scm/define-grobs.scm