Merge branch 'hp-dv6426us-par'

Conflicts:
	.crontab.local
	.git.info.exclude
	.wmii/wmiirc_local

5 files changed, 0 insertions, 36 deletions

diff --git a/.prefix/bin/x-pdf b/.prefix/bin/x-pdf
deleted file mode 100755
index a9893c0..0000000
--- a/.prefix/bin/x-pdf
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-if   [ -x "`which okular 2>/dev/null`" ]; then
-	okular "$@"
-elif   [ -x "`which evince 2>/dev/null`" ]; then
-	evince "$@"
-elif [ -x "`which xpdf 2>/dev/null`" ]; then
-	xpdf "$@"
-fi
diff --git a/.prefix/bin/x-terminal-emulator b/.prefix/bin/x-terminal-emulator
deleted file mode 100755
index f7290b4..0000000
--- a/.prefix/bin/x-terminal-emulator
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-if   [ -x "`which emacsterm`" ]; then
-	emacsterm $@
-elif [ -x "`which urxvt`" ]; then
-	urxvt $@
-elif [ -x "`which gnome-terminal`" ]; then
-	gnome-terminal $@
-elif [ -x "`which xterm`"]; then
-	xterm $@
-fi
diff --git a/.prefix/bin/x-www-browser b/.prefix/bin/x-www-browser
deleted file mode 100755
index 0ead72a..0000000
--- a/.prefix/bin/x-www-browser
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-list='firefox iceweasel icecat conkeror'
-
-looking=true
-for prog in $list; do
-	if $looking && [ -n "`pgrep $prog`" ]; then
-		$prog $@
-		looking=false
-	fi
-done
-if $looking; then
-	conkeror $@
-fi
diff --git a/.prefix/bin/xmessage b/.prefix/bin/xmessage
deleted file mode 100755
index bd30b5e..0000000
--- a/.prefix/bin/xmessage
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/sh
-gxmessage $@ -fn 'Monospace'
diff --git a/.prefix/bin/xterm b/.prefix/bin/xterm
deleted file mode 120000
index e8d5184..0000000
--- a/.prefix/bin/xterm
+++ /dev/null
@@ -1 +0,0 @@
-x-terminal-emulator
\ No newline at end of file