Jayke Meijer ceb2f51c2c Fixed merge conflict. пре 14 година
..
Makefile cf46a69351 Added old Makefile back to report folder as an alternative. пре 14 година
report.tex ceb2f51c2c Fixed merge conflict. пре 14 година
rules.mk e96d64410a Merged Makefile from report with root level. пре 14 година