Merge branch 'master' of ssh://jscatala@repo.or.cz/srv/git/informe1syo
treeaab4e89bffa64f091870b34ff2b511f06fcb6737
-rw-r--r-- 81 .gitignore
-rw-r--r-- 224 Makefile
-rw-r--r-- 14023 inf.tex