Skip to content
Blame History Permalink
  • Andreas Schmidt's avatar
    Merge branch 'feature/clockSync' · ec5e890e
    Andreas Schmidt authored 
    Conflicts:
	src/prrt/clock.c
	src/prrt/clock.h
	src/prrt/packet.c
	src/prrt/processes/data_receiver.c
	src/prrt/processes/data_transmitter.c
	src/prrt/socket.c
	src/prrt/socket.h
    ec5e890e