| commit | 79ccfe9e8140eb8f0ac804d84aeecaffa4a77f2c | |
| author | Francisco Vila <paconet.org@gmail.com> | |
| Tue, 6 Mar 2012 18:15:24 +0000 (6 19:15 +0100) | ||
| committer | Francisco Vila <paconet.org@gmail.com> | |
| Tue, 6 Mar 2012 18:15:24 +0000 (6 19:15 +0100) | ||
| tree | d5468f5688e97951a59b6808be998e2d2b7f38e7 | treesnapshot (tar.gz zip) |
| parent | 1ef2a391e52e4f3454cd31b835b69baab0fdbae7 | commitdiff |
| parent | 4157dbc2714e15a193542ebf9751a94ff196a7a4 | commitdiff |
Merge /media/7982-0E44/lilypond-ejercicios/
Conflicts:
apuntes-05-barras-beethoven5th.tex
apuntes-28-holst-2.tex
apuntes-29-espanol.tex
holst-marte.ly
introduccion.tex
Conflicts:
apuntes-05-barras-beethoven5th.tex
apuntes-28-holst-2.tex
apuntes-29-espanol.tex
holst-marte.ly
introduccion.tex