Jayke Meijer ceb2f51c2c Fixed merge conflict. 14 rokov pred
..
Makefile cf46a69351 Added old Makefile back to report folder as an alternative. 14 rokov pred
report.tex ceb2f51c2c Fixed merge conflict. 14 rokov pred
rules.mk e96d64410a Merged Makefile from report with root level. 14 rokov pred