diff options
author | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
---|---|---|
committer | James Meyer <james.meyer@operamail.com> | 2011-10-19 18:31:38 (GMT) |
commit | d9aad8b00a9f3fb60e456c0e528df90189acb5b3 (patch) | |
tree | 6b9126d2336c62d1e5533798e7348f6a5723f6ba /abs/core/fluxbox/keys | |
parent | d9a08ac22f9c6661cf3b478927be321274d10794 (diff) | |
parent | c65b741914b31ac88086e363edc4415eb6aa1686 (diff) | |
download | linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.zip linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.gz linhes_pkgbuild-d9aad8b00a9f3fb60e456c0e528df90189acb5b3.tar.bz2 |
Merge remote-tracking branch 'origin/testing' into testing
Conflicts:
abs/core/LinHES-config/PKGBUILD
Diffstat (limited to 'abs/core/fluxbox/keys')
-rw-r--r-- | abs/core/fluxbox/keys | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/abs/core/fluxbox/keys b/abs/core/fluxbox/keys index 3a4dfa7..a2bfd93 100644 --- a/abs/core/fluxbox/keys +++ b/abs/core/fluxbox/keys @@ -29,7 +29,7 @@ Mod1 F10 :Workspace 10 Mod1 F11 :Workspace 11 Mod1 F12 :Workspace 12 Mod1 x :ExecCommand tvterm.sh -Mod1 s :ExecCommand sudo taskset -c 0 mythtv-setup +Mod1 s :ExecCommand mythtv-setup #Mod1 m :ExecCommand mythfrontend --logfile /var/log/mythtv/mythfrontend.log Mod1 m :ExecCommand /usr/LH/bin/mythfrontend-start Mod1 1 :ExecCommand sudo sv start mythbackend |