Merge git://repo.or.cz/opera_libre
commit73572fcf13375cf4ef3e23d2482a8bcf04020c4d
authorValentin Villenave <valentin@localhost.localdomain>
Thu, 11 Dec 2008 12:37:02 +0000 (11 13:37 +0100)
committerValentin Villenave <valentin@localhost.localdomain>
Thu, 11 Dec 2008 12:37:02 +0000 (11 13:37 +0100)
tree242a063c87a05d8cff26d38a910e78d0ee1a6585
parentc1a3b9a49b6dc2d7c09db4f747c80a3dadd29548
parent34ccc8d6b5873427c5b48a1caf704308e336a01f
Merge git://repo.or.cz/opera_libre

Conflicts:
instruments/clarinette2.ly
instruments/flute1.ly
instruments/flute2.ly
instruments/saxophone2.ly
instruments/violoncelle1.ly
instruments/clarinette1.ly
instruments/clarinette2.ly
instruments/contrebasse.ly
instruments/flute1.ly
instruments/flute2.ly
instruments/saxophone1.ly
instruments/saxophone2.ly
instruments/violoncelle1.ly
instruments/violoncelle2.ly