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 /beagle/debian-rfs/usr/lib/mime/packages | |
| 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 'beagle/debian-rfs/usr/lib/mime/packages')
| -rw-r--r-- | beagle/debian-rfs/usr/lib/mime/packages/sensible-utils | 1 | ||||
| -rw-r--r-- | beagle/debian-rfs/usr/lib/mime/packages/tar | 2 | ||||
| -rw-r--r-- | beagle/debian-rfs/usr/lib/mime/packages/util-linux | 2 |
3 files changed, 0 insertions, 5 deletions
diff --git a/beagle/debian-rfs/usr/lib/mime/packages/sensible-utils b/beagle/debian-rfs/usr/lib/mime/packages/sensible-utils deleted file mode 100644 index 3260548..0000000 --- a/beagle/debian-rfs/usr/lib/mime/packages/sensible-utils +++ /dev/null @@ -1 +0,0 @@ -text/html; /usr/bin/sensible-browser %s; description=HTML Text; nametemplate=%s.html; priority=6 diff --git a/beagle/debian-rfs/usr/lib/mime/packages/tar b/beagle/debian-rfs/usr/lib/mime/packages/tar deleted file mode 100644 index c203ff6..0000000 --- a/beagle/debian-rfs/usr/lib/mime/packages/tar +++ /dev/null @@ -1,2 +0,0 @@ -application/x-tar; /bin/tar tvf -; print=/bin/tar tvf - | print text/plain:-; copiousoutput -application/x-gtar; /bin/tar tvzf -; print=/bin/tar tvzf - | print text/plain:-; copiousoutput diff --git a/beagle/debian-rfs/usr/lib/mime/packages/util-linux b/beagle/debian-rfs/usr/lib/mime/packages/util-linux deleted file mode 100644 index 2653e42..0000000 --- a/beagle/debian-rfs/usr/lib/mime/packages/util-linux +++ /dev/null @@ -1,2 +0,0 @@ -text/plain; more %s; needsterminal; priority=5 -text/*; more %s; needsterminal; priority=1 |