diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-26 13:56:43 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-04-26 13:56:43 -0400 |
commit | a0b0e2faf634625c2ae1981cb1a5604648ad8334 (patch) | |
tree | f288acabdb8849a46e333536a71004d39ac2ba34 /.config/wmii-hg/autostart | |
parent | e93048c125c728d61613d76eab938da9bf7f41c4 (diff) | |
parent | f6742e8302f615b75eb6a2dd4faf3b306be56012 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.config/wmii-hg/autostart
Diffstat (limited to '.config/wmii-hg/autostart')
-rwxr-xr-x | .config/wmii-hg/autostart | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.config/wmii-hg/autostart b/.config/wmii-hg/autostart index ed37f33..f5e5419 100755 --- a/.config/wmii-hg/autostart +++ b/.config/wmii-hg/autostart @@ -6,8 +6,7 @@ daemon lxpanel &> /dev/null #daemon nm-applet &> /dev/null daemon dunst &> /dev/null daemon blueman-applet &> /dev/null -#daemon linphone --iconified &> /dev/null -dameon clipit -dn &> /dev/null +dameon clipit -dn &> /dev/null Action rbar_cpu 01 & Action rbar_clock 99 & |