Merge git://repo.or.cz/opera_libre
commite99d7b43296467aef43cf98d6805daa665167e9c
authorEdwige Hudson <edwige.hudson@gmail.com>
Sun, 14 Dec 2008 18:31:01 +0000 (14 19:31 +0100)
committerEdwige Hudson <edwige.hudson@gmail.com>
Sun, 14 Dec 2008 18:31:01 +0000 (14 19:31 +0100)
treeadefde5f8ea40a884d080e22bcec25236bb24cfc
parentb7aa4f05ea8f860588e8d630a9adde3a2fe4f3c6
parent5918571a673e23e20c68b2c0f5a40bb8ed28caed
Merge git://repo.or.cz/opera_libre

Conflicts:

instruments/alto2.ly
instruments/violoncelle2.ly
instruments/alto1.ly
instruments/alto2.ly
instruments/saxophone2.ly
instruments/violoncelle1.ly
instruments/violoncelle2.ly