summaryrefslogtreecommitdiff
path: root/.local
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@sbcglobal.net>2015-01-29 01:27:46 -0500
committerLuke Shumaker <lukeshu@sbcglobal.net>2015-01-29 01:27:46 -0500
commitb6695d61d479e5688f66077f79b2f44e44de4f59 (patch)
tree9ccf830ff6a9928f5af6c92722a98a35e9add43f /.local
parent2a6dc16a75f4d7beed631d97a99b6a1fc82c4e79 (diff)
parent6a5bd645c59b44ae87d09cf350b38e04fbf99d81 (diff)
Merge remote-tracking branch 'origin/build64-par' into gluglugt60-par
Conflicts: .config/systemd/user/default.target.wants/emacs-daemon.service
Diffstat (limited to '.local')
0 files changed, 0 insertions, 0 deletions