]> rtime.felk.cvut.cz Git - jenkicar/rpp-simulink.git/commit
Merge branch 'maint-rm48' into rm48/master
authorMichal Horn <hornmich@fel.cvut.cz>
Wed, 10 Dec 2014 15:09:03 +0000 (16:09 +0100)
committerMichal Horn <hornmich@fel.cvut.cz>
Wed, 10 Dec 2014 15:09:03 +0000 (16:09 +0100)
commitf79d7f594e4d8e3ef1f83acdb2b354ecf5977432
treee8b18d66a6ad8eb387216fde2d48af6388fa965a
parentf3514ec823dfd50b629bf4afbf26d597458cc82a
parent94d932a9d563f7501d7eeef6182723a39b815659
Merge branch 'maint-rm48' into rm48/master

Conflicts:
doc/rpp_simulink.tex
doc/rpp_simulink.tex