| commit | f51fd27062ef92ea0dd13c1c95d6b7eda1a6e342 | |
| author | Francisco Vila <paconet.org@gmail.com> | |
| Mon, 8 Apr 2013 18:43:01 +0000 (8 20:43 +0200) | ||
| committer | Francisco Vila <paconet.org@gmail.com> | |
| Mon, 8 Apr 2013 18:43:01 +0000 (8 20:43 +0200) | ||
| tree | 94fea7e7a494f3cc341bce8820f89a8340b2ad70 | treesnapshot (tar.gz zip) |
| parent | 68124707f427a121f5127ec33a81bd0fc2086f0e | commitdiff |
| parent | 690de08e074f31c7598f965b4fa117255ac93421 | commitdiff |
Merge /media/fravd/SLCNPWR_4GB/lilypond-apuntes-bare
Conflicts:
Makefile
apuntes-02-cumple.tex
apuntes-29-espanol.tex
collections.tex
libro.tex
Conflicts:
Makefile
apuntes-02-cumple.tex
apuntes-29-espanol.tex
collections.tex
libro.tex
| apuntes-02-cumple.tex | diff1 | diff2 | blobhistory |