| commit | 70ff1234728172a69067f52e9792ede6ec291df7 | |
| author | Valentin <v.villenave@gmail.com> | |
| Sun, 21 Dec 2008 22:37:37 +0000 (21 23:37 +0100) | ||
| committer | Valentin <v.villenave@gmail.com> | |
| Sun, 21 Dec 2008 22:37:37 +0000 (21 23:37 +0100) | ||
| tree | f527167e56f40e211c3c6466b1b7838bd1a2cb40 | treesnapshot (tar.gz zip) |
| parent | 0de3cbfdd46cc280d82688cd7dd01b42c264341c | commitdiff |
| parent | 8f49b635f06cd228d7ccef4dc57b25051bc8f7c6 | commitdiff |
Merge git://repo.or.cz/opera_libre
Conflicts:
instruments/clarinette.ly
instruments/clarinetteB.ly
instruments/contrebasse.ly
instruments/flute1.ly
instruments/flute2.ly
instruments/percu.ly
instruments/saxophone1.ly
instruments/saxophone2.ly
Conflicts:
instruments/clarinette.ly
instruments/clarinetteB.ly
instruments/contrebasse.ly
instruments/flute1.ly
instruments/flute2.ly
instruments/percu.ly
instruments/saxophone1.ly
instruments/saxophone2.ly
14 files changed: