| commit | 4189e020fb03d60365ebea7225a25c05cb4d864d | |
| author | Valentin Villenave <valentin@villenave.net> | |
| Tue, 17 Apr 2012 16:34:49 +0000 (17 18:34 +0200) | ||
| committer | Valentin Villenave <valentin@villenave.net> | |
| Tue, 17 Apr 2012 16:34:49 +0000 (17 18:34 +0200) | ||
| tree | b020413bb4f28122cbac488d7ae67cc27a71d97e | treesnapshot (tar.gz zip) |
| parent | 1d8b5864dbd2cc93a222398578ca822678deb267 | commitdiff |
| parent | 6b2a12782882835a8bcfdf96adf8313e2ef2af8d | commitdiff |
Merge branch 'master' into sonate
Conflicts:
scores/sonate/carillon.ly
scores/sonate/mesures.ly
scores/sonate/scherzo.ly
scores/sonate/score.ly
scores/sonate/variations.ly
Conflicts:
scores/sonate/carillon.ly
scores/sonate/mesures.ly
scores/sonate/scherzo.ly
scores/sonate/score.ly
scores/sonate/variations.ly