Commit Graph

5 Commits

Author SHA1 Message Date
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
Maryna Kravtsova
73d6bd42c2 all 2020-10-26 14:58:37 +01:00
7a37447541 Update 'cv1/program.c' 2020-10-26 11:21:05 +00:00
Maryna Kravtsova
d3aee7f119 program2 2020-09-29 22:54:46 +02:00
Maryna Kravtsova
1c5e40c6cf program1 2020-09-29 22:40:24 +02:00