diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
commit | 8ff950d098146bc929504b062bcc6ccd5a2cb6ed (patch) | |
tree | e5d73cf1997b28bbaa24a693f5d8c2abb45be313 /.wmii-hg/ctl-init | |
parent | 9d689e7d224b5c1ea3ab3018998135979f19c5a9 (diff) | |
parent | b0cdbb3da2c2b36d3c65b00db4eaf5a0d29c2cd6 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.config/bash/rc.sh
.config/login.sh
.config/ssh/config
.config/wmii/include.sh
Diffstat (limited to '.wmii-hg/ctl-init')
-rw-r--r-- | .wmii-hg/ctl-init | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/.wmii-hg/ctl-init b/.wmii-hg/ctl-init deleted file mode 100644 index ecba5b3..0000000 --- a/.wmii-hg/ctl-init +++ /dev/null @@ -1,6 +0,0 @@ -bar off -font xft:Monospace-8 -focuscolors $WMII_FOCUSCOLORS -normcolors $WMII_NORMCOLORS -grabmod $MODKEY -border 1 |