Merge branch 'schulung'

updates from current linutronix schulung.git

Conflicts:
	Makefile
	configpres.tex
	flash-memory/ubi/handout_ubi_de.tex
	handout.tex
	index.txt
	pres_master.tex
	vorl.tex
	vorl1.tex
	vorl2.tex
	vorl3.tex
	vorl4.tex
	vorl5.tex

Signed-off-by: Manuel Traut <manut@mecka.net>

4 files changed, 0 insertions, 1 deletions

diff --git a/beagle/debian-rfs/lib/terminfo/r/rxvt b/beagle/debian-rfs/lib/terminfo/r/rxvt
deleted file mode 100644
index 6ba1a8e..0000000
--- a/beagle/debian-rfs/lib/terminfo/r/rxvt
+++ /dev/null
diff --git a/beagle/debian-rfs/lib/terminfo/r/rxvt-basic b/beagle/debian-rfs/lib/terminfo/r/rxvt-basic
deleted file mode 100644
index 1b43804..0000000
--- a/beagle/debian-rfs/lib/terminfo/r/rxvt-basic
+++ /dev/null
diff --git a/beagle/debian-rfs/lib/terminfo/r/rxvt-m b/beagle/debian-rfs/lib/terminfo/r/rxvt-m
deleted file mode 120000
index f61abac..0000000
--- a/beagle/debian-rfs/lib/terminfo/r/rxvt-m
+++ /dev/null
@@ -1 +0,0 @@
-rxvt-basic
\ No newline at end of file
diff --git a/beagle/debian-rfs/lib/terminfo/r/rxvt-unicode b/beagle/debian-rfs/lib/terminfo/r/rxvt-unicode
deleted file mode 100644
index 981d9dc..0000000
--- a/beagle/debian-rfs/lib/terminfo/r/rxvt-unicode
+++ /dev/null