| commit | ca768eec6c613fc00d8adb220ef04f03dcfdc95b | |
| author | Francisco Vila <paconet.org@gmail.com> | |
| Sat, 21 Jul 2018 16:47:07 +0000 (21 18:47 +0200) | ||
| committer | Francisco Vila <paconet.org@gmail.com> | |
| Sat, 21 Jul 2018 16:47:07 +0000 (21 18:47 +0200) | ||
| tree | a129bf39a2b4c7d0f92267980f40f74f9e709175 | treesnapshot (tar.gz zip) |
| parent | fb325c93c8706b53c043c1507f6c0d17fdd46b7a | commitdiff |
| parent | 7922378b22cfa604afa809efa3d4c8a3797ccdf6 | commitdiff |
Merge /home/fravd/source/lilypond-ejercicios into source-lilypond-ejercicios
# Conflicts:
# libro.tex
# lilypond-by-example/haz.sh
# lilypond-by-example/lpe.tex
# Conflicts:
# libro.tex
# lilypond-by-example/haz.sh
# lilypond-by-example/lpe.tex
| libro.tex | diff1 | diff2 | blobhistory |