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