diff options
author | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
---|---|---|
committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2015-01-29 01:48:23 -0500 |
commit | b68ce750ac90da4fb88669d256666dbaa39f4338 (patch) | |
tree | cabf50b7a85d1062ba60bd3ebf45fb17965884ca /.config/lxpanel | |
parent | 15820c5e8ed6f01cf4a87b85126eb7f346ebab3d (diff) | |
parent | 34bbf66a460e5c622e209211869b3a8bde8a68d5 (diff) |
Merge remote-tracking branch 'origin/gluglugt60-par' into build64-par
Conflicts:
.config/login.sh
.config/lxpanel/default/config
.config/wmii-hg/config.sh
Diffstat (limited to '.config/lxpanel')
-rw-r--r-- | .config/lxpanel/default/config | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/.config/lxpanel/default/config b/.config/lxpanel/default/config index 9466011..e0d2b50 100644 --- a/.config/lxpanel/default/config +++ b/.config/lxpanel/default/config @@ -1,2 +1 @@ [Command] -Logout=bash -c 'echo quit >> $WMII_DIR/ctl' |