summaryrefslogtreecommitdiff
path: root/.wmii/wmiirc_local
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 22:49:21 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 22:49:21 -0400
commita96ee608ce4be813ce381a6a0c195591f633986e (patch)
tree5ec43d77ea079df984ca612d36c35e3429ee8e83 /.wmii/wmiirc_local
parentf34be2177db4152ef8857a2362afa35c029fa314 (diff)
parentc486006f4d03065bc8639f574bc07d5c7dc15345 (diff)
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfilescreated-generic
Conflicts: .alsa.full .crontab .crontab.local .wmii/wmiirc.local .xmodmap
Diffstat (limited to '.wmii/wmiirc_local')
0 files changed, 0 insertions, 0 deletions