Merge /home/fravd/lilypond/ejercicios-clase/apuntes
commit5b2d468b2b4c0c7bcc57bf9ea876de8f0449d348
authorFrancisco Vila <paconet.org@gmail.com>
Tue, 3 Oct 2017 09:38:31 +0000 (3 11:38 +0200)
committerFrancisco Vila <paconet.org@gmail.com>
Tue, 3 Oct 2017 09:38:31 +0000 (3 11:38 +0200)
treef80b97a9a65c070525359450f3e3fd05271ae91f
parent13ba70ea234da5b1afda836a6cc53f92bb1bd20d
parent550f320995a9d3b328392ff7b94572939a146342
Merge /home/fravd/lilypond/ejercicios-clase/apuntes

# Conflicts:
# libro.pdf
# lilypond-by-example/lpe.pdf