diff options
| author | Manuel Traut <manut@mecka.net> | 2013-03-10 12:13:49 +0100 |
|---|---|---|
| committer | Manuel Traut <manut@mecka.net> | 2013-03-10 12:13:49 +0100 |
| commit | 9c0f862749f30800837a45aff5abdcb529867dbc (patch) | |
| tree | b0ca51fff64f12fac03aea4afaa1fa722376844b /handout1.tex | |
| parent | 33b79c725448efd2c9a72e2ae9a1fb04270492f5 (diff) | |
| parent | cea5039322781f6085dd47954af5584ca3f78911 (diff) | |
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>
Diffstat (limited to 'handout1.tex')
| -rw-r--r-- | handout1.tex | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/handout1.tex b/handout1.tex deleted file mode 100644 index 3306a88..0000000 --- a/handout1.tex +++ /dev/null @@ -1,4 +0,0 @@ -\input{configmasterhandout} -\section{Grundlagen} -\input{./linux-basics/what-is-linux/handout_what-is-linux_de.tex} -\input{tailmasterhandout} |