| commit | 2068173437e01a4150d56c6e46eecc0d19fb4a8f | |
| author | Edwige Hudson <edwige.hudson@gmail.com> | |
| Fri, 12 Dec 2008 10:21:12 +0000 (12 11:21 +0100) | ||
| committer | Edwige Hudson <edwige.hudson@gmail.com> | |
| Fri, 12 Dec 2008 10:21:12 +0000 (12 11:21 +0100) | ||
| tree | 56bc20cb1c7c31a457aba764714d3c688b1464da | treesnapshot (tar.gz zip) |
| parent | bef1398e720beec9478dc19710878c6841f82bd4 | commitdiff |
| parent | 73572fcf13375cf4ef3e23d2482a8bcf04020c4d | commitdiff |
Merge git://repo.or.cz/opera_libre
Conflicts:
instruments/alto1.ly
instruments/alto2.ly
instruments/clarinette2.ly
instruments/flute2.ly
instruments/saxophone2.ly
instruments/violon1.ly
instruments/violon3.ly
instruments/violoncelle1.ly
Conflicts:
instruments/alto1.ly
instruments/alto2.ly
instruments/clarinette2.ly
instruments/flute2.ly
instruments/saxophone2.ly
instruments/violon1.ly
instruments/violon3.ly
instruments/violoncelle1.ly
14 files changed: