summaryrefslogtreecommitdiff
path: root/.config/symlinks
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-01-29 01:48:23 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-01-29 01:48:23 -0500
commitb68ce750ac90da4fb88669d256666dbaa39f4338 (patch)
treecabf50b7a85d1062ba60bd3ebf45fb17965884ca /.config/symlinks
parent15820c5e8ed6f01cf4a87b85126eb7f346ebab3d (diff)
parent34bbf66a460e5c622e209211869b3a8bde8a68d5 (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/symlinks')
0 files changed, 0 insertions, 0 deletions