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>

1 files changed, 0 insertions, 53 deletions

diff --git a/beagle/debian-rfs/bin/zless b/beagle/debian-rfs/bin/zless
deleted file mode 100755
index f335012..0000000
--- a/beagle/debian-rfs/bin/zless
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/bin/bash
-
-# Copyright (C) 1998, 2002, 2006, 2007 Free Software Foundation
-
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License along
-# with this program; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-PATH="${GZIP_BINDIR-'/bin'}:$PATH"; export PATH
-
-version="zless (gzip) 1.3.12
-Copyright (C) 2007 Free Software Foundation, Inc.
-This is free software.  You may redistribute copies of it under the terms of
-the GNU General Public License <http://www.gnu.org/licenses/gpl.html>.
-There is NO WARRANTY, to the extent permitted by law.
-
-Written by Paul Eggert."
-
-usage="Usage: $0 [OPTION]... [FILE]...
-Like 'less', but operate on the uncompressed contents of any compressed FILEs.
-
-Options are the same as for 'less'.
-
-Report bugs to <bug-gzip@gnu.org>."
-
-case $1 in
---help)    exec echo "$usage";;
---version) exec echo "$version";;
-esac
-
-if test "${LESSMETACHARS+set}" != set; then
-  # Work around a bug in less 394 and earlier;
-  # it mishandles the metacharacters '$%=~'.
-  space=' '
-  tab='	'
-  newline='
-'
-  LESSMETACHARS="$space$tab$newline'"';*?"()<>[|&^`#\$%=~'
-  export LESSMETACHARS
-fi
-
-LESSOPEN="|gzip -cdfq -- %s"; export LESSOPEN
-exec less "$@"