Merge branch 'can' of rtime.felk.cvut.cz:rpp-test-sw

Conflicts:
	rpp-lib

diff --cc rpp-lib
index b6e768b4fa1af6fde8faec1f3ca2d35f804c384c,35dbacfb3d75fcc5c14ee6aa4b4094a04e72955f..afba18ea9d84f540720ddbb568a2ca7595c77294
--- 1/rpp-lib
--- 2/rpp-lib
+++ b/rpp-lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit b6e768b4fa1af6fde8faec1f3ca2d35f804c384c
 -Subproject commit 35dbacfb3d75fcc5c14ee6aa4b4094a04e72955f
++Subproject commit afba18ea9d84f540720ddbb568a2ca7595c77294

diff --cc rpp-test-sw/commands/cmd_can.c
Simple merge