{"shas":[["e521aae1a6db3b492cc2f55073d6ff53f7d3e374","45c6e7bebb714d66d7fdbe46faf77c90beb48111@gmail.com","\tmodified:   VideoLoad/MYdetektor.h\n\tmodified:   VideoLoad/MYdisplay.cpp\n\tmodified:   VideoLoad/MYdisplay.h\n\tmodified:   VideoLoad/bin/Debug/vidload\n\tmodified:   VideoLoad/main.cpp\n\tmodified:   VideoLoad/obj/Debug/MYdetektor.o\n\tmodified:   VideoLoad/obj/Debug/MYdisplay.o\n\tmodified:   VideoLoad/obj/Debug/main.o\n\tmodified:   VideoLoad/vidload.depend","Pavel Simurda"],["b9caafeb1ab038876dd0c28cb5a09b73e5753404","45c6e7bebb714d66d7fdbe46faf77c90beb48111@gmail.com","Pridany dve staticke metody do MYdisplay.\nPouziti\n\nMYdisplay::ShowImage(IplImage *); // hned potom musi nasledovat cvWaitKey();\n//nebo varianta s ukoncovaci klavesou\nMYdisplay::ShowImage(IplImage *,'q'); // klavesou q se zaver okno\n\nMerge branch 'master' of github.com:straiki/VisionCup-Deep-Team\n\nConflicts:\n\tVideoLoad/bin/Debug/vidload\n\tVideoLoad/obj/Debug/MYdetektor.o\n\tVideoLoad/obj/Debug/MYdisplay.o\n\tVideoLoad/obj/Debug/main.o\n\tVideoLoad/vidload.depend\n\n\tmodified:   MYdisplay.cpp\n\tmodified:   MYdisplay.h","Pavel Simurda"]],"repo":"straiki/VisionCup-Deep-Team","actor":"pajuscz","ref":"refs/heads/master","size":2,"head":"b9caafeb1ab038876dd0c28cb5a09b73e5753404","actor_gravatar":"f91f766f00c0e1764e80228bc2daf859","push_id":29111805}