]> rtime.felk.cvut.cz Git - jenkicar/rpp-simulink.git/commit
Merge branch 'maint-rm48' into rm48/master
authorMichal Horn <hornmich@fel.cvut.cz>
Thu, 11 Dec 2014 16:34:22 +0000 (17:34 +0100)
committerMichal Horn <hornmich@fel.cvut.cz>
Thu, 11 Dec 2014 16:34:22 +0000 (17:34 +0100)
commitb4c8671610cb800dd19ec13b8fe6adb737d00a8f
tree0d1ebd83bee956b18b6c137b40f5ce549aa551c0
parentf92fa662d0f5d91b172a28978c581cb0fb404304
parent6a91c3584829652d1b3780d8938cb7e9a7c1b65d
Merge branch 'maint-rm48' into rm48/master

Conflicts:
rpp/blocks/rpp_lib.slx
doc/rpp_simulink.tex