Merge branch 'maint-rm48' into rm48/master

Conflicts:
	doc/rpp_simulink.tex
	doc/test-sw

diff --cc Makefile
index f2e76c72f78e07220ef4edb3b1ece7288d6bc665,acfb799e7d58e22f5e2a98a3236aa8ed695378a2..aa471265fa55ac79969ec27334533f4ffb106762
--- 1/Makefile
--- 2/Makefile
+++ b/Makefile
@@@ -10,8 -10,14 +10,12 @@@ release: $(RELEASE_BASENAME).zi
        cp doc/rpp_simulink.pdf rpp_simulink-$(RELEASE_VERSION).pdf
  
  $(RELEASE_BASENAME):: lib
-       mkdir -p $@
+       mkdir -p $@/rpp/lib/rpp
+       mkdir -p $@/rpp/lib/os/7.0.2_tms570
 -      mkdir -p $@/rpp/lib/lwip/src
        cp --parents rpp/lib/rpp-lib.lib $@/
 -      cp -r rpp/lib/lwip/src/include $@/rpp/lib/lwip/src/include
+       cp -r rpp/lib/rpp/include $@/rpp/lib/rpp/include
+       cp rpp/lib/rpp/TMS570LS313xFlashLnk.cmd $@/rpp/lib/rpp/TMS570LS313xFlashLnk.cmd
+       cp -r rpp/lib/os/7.0.2_tms570/include $@/rpp/lib/os/7.0.2_tms570/include
        $(MAKE) -C doc
        mkdir -p $@/doc
        cp doc/rpp_simulink.pdf $@/doc

diff --cc doc/rpp_simulink.tex
Simple merge

diff --cc doc/test-sw
index bc441c9ebe319c98fba3d75c8b0b47b3f6d1670c,b6361ca5eca38b897e93d821ea4629df21174219..61697a9f72516095f18681eba78ce419e195b21f
--- 1/doc/test-sw
--- 2/doc/test-sw
+++ b/doc/test-sw
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit bc441c9ebe319c98fba3d75c8b0b47b3f6d1670c
 -Subproject commit b6361ca5eca38b897e93d821ea4629df21174219
++Subproject commit 61697a9f72516095f18681eba78ce419e195b21f

diff --cc rpp/lib
index 0a7353c1aaab68397943c876a48fc949d56d0621,b446fb76462cbf0d15f7a26d078613635d9d8ffd..36b02c8c09ce72798db1dc447a5d7ad99da4a582
--- 1/rpp/lib
--- 2/rpp/lib
+++ b/rpp/lib
@@@ -1,1 -1,1 +1,1 @@@
- Subproject commit 0a7353c1aaab68397943c876a48fc949d56d0621
 -Subproject commit b446fb76462cbf0d15f7a26d078613635d9d8ffd
++Subproject commit 36b02c8c09ce72798db1dc447a5d7ad99da4a582