Maryna Kravtsova cfa845c9fe Merge branch 'master' of git.kemt.fei.tuke.sk:mk757ye/usaa20 ... Conflicts: cv1/program.c		2020-10-26 15:03:09 +01:00
..
program.c	Merge branch 'master' of git.kemt.fei.tuke.sk:mk757ye/usaa20	2020-10-26 15:03:09 +01:00